This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd1690a64268e: graft: add test for reading old graftstate
files with new mechanism (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
pulkit updated this revision to Diff 8892.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2597?vs=8886=8892
REVISION DETAIL
https://phab.mercurial-scm.org/D2597
AFFECTED FILES
tests/test-graft.t
CHANGE DETAILS
diff --git a/tests/test-graft.t
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-graft.t:1417
> An alternative is to use the regular great command to start the process and
> then replace the .hg/graftstate once it's run into conflicts. That might be
> better so we have a repo state (include the merge
martinvonz added inline comments.
INLINE COMMENTS
> pulkit wrote in test-graft.t:1417
> That's a nice idea. I think we can, but the behavior will be bit different
> since graft will think the working directory now contains changes from `rev
> 1` and will straight away try to create a commit
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-graft.t:1417
> Can this line be replaced by `hg log -r 1 -r 2 -T '{node}\n' >
> .hg/graftstate` and remove the need for the extension above (and the need to
> create conflicting changes)?
That's a nice idea. I think we
martinvonz added inline comments.
INLINE COMMENTS
> test-graft.t:1417
> + created new head
> + $ hg oldgraft -r 1 -r 2 --config extensions.oldgraft=$TESTTMP/oldgraft.py
> + merging b
Can this line be replaced by `hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate`
and remove the need for the
pulkit updated this revision to Diff 8886.
pulkit edited the summary of this revision.
pulkit retitled this revision from "graft: add test for reading old format
state files with new mechanism" to "graft: add test for reading old graftstate
files with new mechanism".
REPOSITORY
rHG Mercurial
