Conflict handling (was: Re: 08:16 < abentley> Better phrasing: 'what circumstances should cause us to produce a working tree in a repository branch'?)

[Aaron Bentley]

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

Vincent LADEUIL wrote:
| <snip/>
|
|     >> Some commands have help that's no help at all, like
|     >> "resolve": what is it for and what the heck does it do?
|
|     Aaron>  Well, it's  for marking  a conflict  as  resolved.  I
|     Aaron> agree  that could be  expanded, but I'm not  sure what
|     Aaron> else to say, and I'm happy to admit this is because of
|     Aaron> my implementor perspective.
|
|
| But why  the hell do I  have to mark  a conflict as resolved  ?

We thought that it would be bad to accidentally commit a revision that
contained unresolved conflicts.

| I
| have already  worked to resolve  this conflict !

Bzr can't detect whether the <<<<<<< markers in a file are from new
conflicts or not.  So it detects whether there are conflicts based on
the presence of .THIS .BASE and .OTHER files

| And  worse, even
| informing bzr  that I  resolved it, I  still have  spurious files
| staying in my work dirs...

You should not have any .THIS .BASE or .OTHER files after resolving
conflicts.  Which spurious files do you mean?

| I don't get the point here. Is it something still under work ? Or
| will it stay that way in final version ?

There will probably be some enhancements to conflict handling, but I
don't think this part will go away.

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

iD8DBQFD8ILS0F+nu1YWqI0RAv9NAJ4r5UCNZhpb0TgcBAdLoso4216YDwCdGjGn
fHA24LUoP9sHLpP5Py9/KfY=
=9CUS
-----END PGP SIGNATURE-----