On 9 Apr 2009, at 14:36, Eric Kow wrote:
I think the conclusion was that I would (somewhat reluctantly) accept
patches for darcs push --mark-conflicts and darcs push --allow-
conflicts
being options.
Thanks for the link. Sorry for not searching the archives.
How about making `darcs push --mark-conflicts` and `darcs push --allow-
conflicts` only work on local repositories? That way the workflow
would be:
% cd repo-with-conflict # originally from m...@server:repo
% darcs get m...@server:repo ../repo-merge
% darcs push --mark-conflicts ../repo-merge
% cd ../repo-merge
### fix conflict ###
% cd ../repo-with-conflict
% darcs pull
% darcs push m...@server:repo
WDYT?
As a second thought, this makes me also wonder if there'd be benefit
in being able to:
% darcs push --last-remote
which would make:
% darcs push --mark-conflicts ../repo-merge
% darcs push --last-remote
equivalent to:
% darcs push --mark-conflicts ../repo-merge
% darcs push m...@server:repo
(I have been in the habit of doing `darcs get` locally as much as
possible to avoid changing the remote repository.)
WDYT?
Ashley
--
http://www.patchspace.co.uk/
http://www.linkedin.com/in/ashleymoran
http://aviewfromafar.net/
http://twitter.com/ashleymoran
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
