[PATCH 03 of 10] darcs pull does not clean, so revert repo before feeding to mercurial

Guy Brand gb at isis.u-strasbg.fr
Sun Mar 4 17:07:01 CST 2007


On 04 March at 14:16, jgoerzen at complete.org wrote:

> # HG changeset patch
> # User Guy Brand <gb at isis.u-strasbg.fr>
> # Date 1172095555 -3600
> # Node ID b81693da7440fae39cf7faa0ce496fc78bb77b03
> # Parent  75f87e4fcfce0d11ebdb55eba0c32cebba5c9f09
> darcs pull does not clean, so revert repo before feeding to mercurial
> 
> diff --git a/contrib/darcs2hg.py b/contrib/darcs2hg.py
> --- a/contrib/darcs2hg.py
> +++ b/contrib/darcs2hg.py
> @@ -94,6 +94,7 @@ def darcs_pull(hg_repo, darcs_repo, chas
>  	old_tip = darcs_tip(darcs_repo)
>  	res     = cmd("darcs pull \"%s\" --all --match=\"hash %s\"" % (darcs_repo, chash), hg_repo)
>  	print res
> +	cmd("darcs revert --all", hg_repo, silent=True)

  This is the old patch which was reverting darcs for all pulls.
  That's not smart. Attached is the one which only revert when
  conflict has happened after a darcs pull.

-- 
  bug
-------------- next part --------------
A non-text attachment was scrubbed...
Name: darcs-conflict.patch
Type: text/x-diff
Size: 815 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial-devel/attachments/20070305/f934a44b/darcs-conflict.bin


More information about the Mercurial-devel mailing list