Comments on: Merging In Bazaar http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/ Random stuff Sat, 05 Jul 2008 05:23:53 +0000 http://wordpress.org/?v=2.3.3 By: Alexander Larsson http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/#comment-1 Alexander Larsson Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/#comment-1 There are some problems with the form of three way merges you describe. Take a look at this thread from the monotone list:<p/><a href="http://lists.gnu.org/archive/html/monotone-devel/2005-05/msg00000.html">http://lists.gnu.org/archive/html/monotone-devel/2005-05/msg00000.html</a><p/>Apparently there can be cases where its impossible to pick an ancestor so that the three-way merge doesn't silently corrupt code.<br/> There are some problems with the form of three way merges you describe. Take a look at this thread from the monotone list:

http://lists.gnu.org/archive/html/monotone-devel/2005-05/msg00000.html

Apparently there can be cases where its impossible to pick an ancestor so that the three-way merge doesn’t silently corrupt code.

]]> By: James Henstridge http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/#comment-2 James Henstridge Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/#comment-2 As Arch uses persistent identifiers for files, it would be able to detect the problems mentioned in that mailing list post, and treat them as conflicts.<p/>Yes, this may result in more conflicts than a "perfect merge", but I don't think it would lead to the silent corruption that you mention (i.e. some of the problems only occur when you move to non-persistent IDs).<p/>Bazaar definitely has some warts, but it is useful for real work right now, and will offer a smooth upgrade path to bazaar-ng (which gets rid of some warts that are required for compatibility with the Arch protocol). As Arch uses persistent identifiers for files, it would be able to detect the problems mentioned in that mailing list post, and treat them as conflicts.

Yes, this may result in more conflicts than a “perfect merge”, but I don’t think it would lead to the silent corruption that you mention (i.e. some of the problems only occur when you move to non-persistent IDs).

Bazaar definitely has some warts, but it is useful for real work right now, and will offer a smooth upgrade path to bazaar-ng (which gets rid of some warts that are required for compatibility with the Arch protocol).

]]> By: H Duerer http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/#comment-3 H Duerer Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/05/24/merging-in-bazaar/#comment-3 I thought the real question was not whether to use Arch or Subversion but rather Arch or Darcs (or ... ).<p/>As many before me I have found Darcs easier to use and have not yet come across some newbie-suitable explanation why arch would be preferable. Same explanations in that direction would surely be appreciated. I thought the real question was not whether to use Arch or Subversion but rather Arch or Darcs (or … ).

As many before me I have found Darcs easier to use and have not yet come across some newbie-suitable explanation why arch would be preferable. Same explanations in that direction would surely be appreciated.

]]>