Conflict resolution workflow (was Re: Recipes vs. Looms vs. pipelines)

John Arbash Meinel john at arbash-meinel.com
Fri Dec 18 20:12:22 GMT 2009


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

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>> Barry Warsaw wrote:
>>> On Dec 17, 2009, at 6:29 PM, Aaron Bentley wrote:
> 
>> The only issue is the flags you might pass to 'merge'. Like --weave,
>> --reprocess, etc. Those tend to only get explicitly passed in complex
>> merge scenarios. But you also only need to share state in... complex
>> merge scenarios. :)
> 
> At least we should be able to detect whether the merge produced the
> right content, by looking at the working tree's merge-hashes.
> 
> I guess we could just loop through all possible merge types :-)
> 
> Aaron

So are you thinking to only have "bzr diff -r merge:" when there is an
active merge in progress? I think Barry would also like to be able to
see this information after the fact. (Though I'm not 100% sure.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksr4iYACgkQJdeBCYSNAANeqgCfYpTGQw9nMeXnTu6404Drx/BO
gwoAoJMBVCf6Q5GWUNaj953RuKgfGS7v
=Ody/
-----END PGP SIGNATURE-----



More information about the bazaar mailing list