|
⇤ ← Revision 1 as of 2008-01-19 11:15:38
Size: 1429
Comment: new
|
Size: 1457
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 29: | Line 29: |
| by changing the history of {{{bzr1}}}, this means already commited changes to branch {{{bzr1}}} are deleted. | by changeing the history of {{{bzr1}}}. '''Some already committed changes to branch {{{bzr1}}} are deleted''' (the diverging changes). |
| Line 32: | Line 32: |
Bazaar is another ["DistributedSCM"] (see http://bazaar-vcs.org/).
A Bazaar "branch" roughly corresponds to a Mercurial [:Repository:repository].
Comparing Use Cases
Push
In Bazaar, the push command has an --overwrite option which modifies the history of the target branch. Example:
Assume we have a Bazaar branch in directory bzr1 and branched that to bzr1-1 (using bzr branch bzr1 bzr1-1). Then we commit some changes in both branches, thus making the branches diverge.
Then in bzr1-1 we do:
> bzr push ..\bzr1 bzr: ERROR: These branches have diverged. Try using "merge" and then "push".
will fail because the two branches have diverged.
But specifying --overwrite will succeed:
> bzr push ..\bzr1 --overwrite All changes applied successfully. Pushed up to revision 2.
by changeing the history of bzr1. Some already committed changes to branch bzr1 are deleted (the diverging changes).
In Mercurial, it is not possible to delete already committed changesets when doing a [:Push:push].
General Comparison
["BzrVsHg"]
[http://www.selenic.com/pipermail/mercurial-devel/2008-January/004361.html bzr wins a performance test], by Bryan O'Sullivan, Fri Jan 18 15:33:47 CST 2008
References
[http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html Bazaar User Reference] (manual)