[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: How to join identical branches?
From: |
Koen Kooi |
Subject: |
[Monotone-devel] Re: How to join identical branches? |
Date: |
Tue, 12 Feb 2008 10:23:33 +0100 |
User-agent: |
Thunderbird 2.0.0.9 (Macintosh/20071031) |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Stephen Leake schreef:
| "Nuno Lucas" <address@hidden> writes:
|
|> I have 2 branches with a common ancestor, but during some time they
|> were apart and some renames, drops and adds were made. Now the 2
|> branches are identical because the contents was generalized to
|> accommodate both cases.
|>
|> Because of the renames, add's and drops, propagate fails with "rename
|> target conflict".
|> If both branches are identical how can I resolve the "non-content
|> conflicts"?
|
| In similar situations, the only way I have discovered is to drop the
| conflicting file from the target of the propagate. Then the propagate
| will restore it.
|
| I hope there is a better way.
|
| I'd like to change monotone to offer to merge the conflicting files;
| that would clearly work in this case, and is The Right Thing in the
| cases I have run into as well.
|
| My most common case is when I write a small file on one machine,
| forget to check it in, and then write the same small file on another
| machine. When I finally get both checked in, I get a non-content
| conflict.
It would be nice if monotone would compare the files and if the content
is identical skip the error message and for non-identical files offer to
merge it.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFHsWWVMkyGM64RGpERArs0AJsFZuNphGdIaNxRSogSsSfled6dlACfd7w6
KUHgysa6RYpYr4s4zn0gxo0=
=YaQY
-----END PGP SIGNATURE-----
- [Monotone-devel] How to join identical branches?, Nuno Lucas, 2008/02/11
- Re: [Monotone-devel] How to join identical branches?, Julio M. Merino Vidal, 2008/02/11
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/12
- [Monotone-devel] Re: How to join identical branches?,
Koen Kooi <=
- Re: [Monotone-devel] How to join identical branches?, Nuno Lucas, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/14
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/14
- [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/19
- Re: [Monotone-devel] improving show_conflicts, Derek Scherger, 2008/02/20