On 6/3/06, Jeronimo Pellegrini <[EMAIL PROTECTED]> wrote:
Hello.
I recently added the same directory in two working copies,
so I had this problem:
$ mnt up
mtn: updating along branch 'info.aleph0.mdp'
mtn: selected update target 5fee30a981c1ea1f0a092d8c41d1c43309d25427
mtn: warning: rename target conflict: nodes 2,147,483,844, 2,158, both want
parent 372, name pomdp-solve-5.3
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts
So, no problem -- I searched the mailing list, then found the solution:
delete the files in one of the copies, and then try merging again.
I did, and now this is what happens:
$ mnt merge
mtn: starting with revision 1 / 2
mtn: merging with revision 2 / 2
mtn: [source] 5562f666256f7125cc349878dce1786e6fd1b13f
mtn: [source] 97281ebb56923b46aa261e8558fc0530a6af4de3
mtn: [merged] 024040bcff47283778d9c9169a85adbb1ed395ce
mtn: note: your workspaces have not been updated
This means it worked. All you have to do now is:
mtn up
monotone never updates your workspace automatically after a merge.
I had to remove _MTN/tmp before it actually worked.
Maybe this shouldn't be necessary?
It isn't.
--
Justin Patrin
_______________________________________________
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/monotone-devel
