Question/idea about multiple developers committing to one branch
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Dec 4 07:31:39 GMT 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Nicholas Allen wrote:
> So when
> pushing to a location bzr just needs to determine if there have been
> merges from that location and reorder the parents of the merged
> revisions so that the push location's revisions are the first parent
> instead of the second parent of the merged revision.
You can't change the order of the parents of a revision. The order of
the parents is part of the logical structure of a revision.
You can't change the logical structure of a revision in bzr, because bzr
is based on the assumption that a given revision-id always corresponds
to exactly the same logical data all the time, no matter where it
encounters the revision-id. You can play those kinds of games on a
centralized system, but you can't do that with a distributed system. If
you try, you'll break it.
You could create a new revision, but that misses the point of recording
merges.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFc87b0F+nu1YWqI0RAiXPAKCB5x/Va53qoYKL9n+9ageqYLk4zwCeJpFQ
E4pscBdEl1FrJpgtoso7OGI=
=9vxF
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list