Hi all,
I'm having a problem recovering from a failed push. The situation is the
following: I have two repositories in different machines, wonderland and
neverland. Both are in the same status. Now, I modify neverland as follows:
- Modify the file a.txt
- Add the file b.txt
- Add the file hisdir/c.txt
Then, I record all as patch foo and try to push it from neverland to
wonderland
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
neverland$ darcs push
Pushing to wonderland:/repo...
Mon Feb 20 13:41:57 CET 2006 [EMAIL PROTECTED]
* foo
Shall I push this patch? (1/1) [ynWvpxqadjk], or ? for help: y
Fail: takeLock c.txt in repo/hisdir: permission denied (Permission denied)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
The problem was that my colleague, who also has access to the repository
in wonderland, forgot to give write permissions to "hisdir" to the
group. That's just fine. I sent him an email and he modified the
permissions. So, I try to push again the patch, and I got
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
neverland$ darcs push
Pushing to wonderland:/repo...
Mon Feb 20 13:41:57 CET 2006 [EMAIL PROTECTED]
* foo
Shall I push this patch? (1/1) [ynWvpxqadjk], or ? for help: y
darcs failed: Refusing to apply patches leading to conflicts.
There are conflicts in the following files:
./a.txt ./b.txt
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
If I go to wonderland and run "darcs whatsnew", even when I didn't
modify that copy, it tells me that some lines in file "a.txt" were
removed, actually the changes corresponding patch foo, and the old lines
where added. I don't see file "b.txt" anywhere, so I guess it was added
and remove, but it still gives me conflicts.
- Is this behaviour normal?
- Can I just force the push in any way?
Thanks, and sorry for the large email, but I wanted to express clearly
what was the problem
cheers
Boriss
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
