Checkout existing branch to established workspace (.moved)

Aaron Bentley aaron at aaronbentley.com
Fri Mar 23 21:04:45 UTC 2012


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

On 12-03-23 04:13 PM, Mark Grandi wrote:
> (sorry, resent. I suck at mailing lists)
> 
> Me and Jelmer had a conversation about this on IRC 
> (http://bpaste.net/show/25779/) and I brought up that it would be
> nice to have it so if you checkout/branch into a directory that has
> conflicts (aka it tries to branch a file named foo.txt but foo.txt
> already exists), it should abort the branch/checkout and tell the
> user, and then make them choose to either move the conflicting
> files to .moved (current behavior), replace the conflicting files,
> or merge them (and have them conflicting like Kevin was wanting.

I don't see how you can merge the files.  A three-way merge requires
three versions of the file: the local version (THIS), the branch
version (OTHER), and the version they derived from (BASE).  We don't
know what version they derived from, so we can't perform a three-way
merge.

> but i feel having bzr require an option to move the conflicting
> files to .moved would be easy enough to implement (and just have it
> abort if there are conflicting files by default), and would prevent
> headaches like this in the future, until the ideal fix is figured
> out

The whole point of conflicts is that the user can decide what's the
correct resolution.  They should not be something to be feared.  They
are just what you get when bzr can't know exactly what you wanted.
Tools like "resolve --take-this" should enable to you automate your
choices, and shell scripting should also be easy.

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

iEYEARECAAYFAk9s5W0ACgkQ0F+nu1YWqI0g2ACfck4gS6/lLurBbkFd4YNkN+Tm
2YgAnR0g3Sqr27x/mdDv+zWMvK2A91jX
=opR+
-----END PGP SIGNATURE-----



More information about the bazaar mailing list