negative numbers of revisions pulled ??

Joseph Wakeling joseph.wakeling at webdrake.net
Thu May 11 02:02:23 BST 2006


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I have a couple of branches which diverged, then were merged back into
sync.  Of course, the merged-from branch had more revisions recorded
than the other.  Pulling a minor revision to this branch resulted in a
negative number of revisions being pulled, and the revision history
being replaced with that of the branch which previously had been merged to.

So, two questions: (1) Why?  and more important, (2) some of the merges
contained many patches and it was useful, in the merged-from branch, to
have these considered as separate revisions.  Now that the pull command
has overwritten the revision history (I did *not* use --overwrite!), how
do I get diffs between these individual changes, given that the merge
lumps them as one big revision?

I've kept the .bzr.backup directories so if restoration would be a good
option, I can go for it. :-)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFEYo0fcjylL0sfzuERAvchAJoDiy921wotHHOTEREIXHOe4DIQdQCfd7Yh
gAIY+eQaaCJlUFKqeivt+mg=
=D54d
-----END PGP SIGNATURE-----




More information about the bazaar mailing list