mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
23e41d98e5
Summary: copytracing extension is going to be simpler than I expected in the beginning. There is no need to separate folder, let's move it to hgext3rd Test Plan: arc unit Reviewers: #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5146585 Tasks: 18508761 Signature: t1:5146585:1496147733:ad6ad14f663a8b9bf4b687f0767395321f9840b7
47 lines
1.5 KiB
Perl
47 lines
1.5 KiB
Perl
|
|
$ extpath=`dirname $TESTDIR`
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> rebase=
|
|
> copytrace=$extpath/hgext3rd/copytrace.py
|
|
> [experimental]
|
|
> disablecopytrace=True
|
|
> EOF
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo 1 > 1
|
|
$ hg add 1
|
|
$ hg ci -m 1
|
|
$ echo 2 > 1
|
|
$ hg ci -m 2
|
|
$ hg up 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg mv 1 2
|
|
$ hg ci -m dest
|
|
created new head
|
|
$ hg rebase -s 1 -d .
|
|
rebasing 1:812796267395 "2"
|
|
other [source] changed 1 which local [dest] deleted
|
|
hint: if this message is due to a moved file, you can ask mercurial to attempt to automatically resolve this change by re-running with the --tracecopies flag, but this will significantly slow down the operation, so you will need to be patient.
|
|
Source control team is working on fixing this problem.
|
|
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ hg rebase --abort
|
|
rebase aborted
|
|
$ hg rebase -s 1 -d . --tracecopies
|
|
rebasing 1:812796267395 "2"
|
|
merging 2 and 1 to 2
|
|
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-backup.hg (glob)
|
|
|
|
Make sure prompt merge tool docs are still available
|
|
$ hg help merge-tools | grep -A 2 ":prompt"
|
|
":prompt"
|
|
Asks the user which of the local 'p1()' or the other 'p2()' version to
|
|
keep as the merged version.
|
|
--
|
|
8. Otherwise, ":prompt" is used.
|
|
|
|
Note:
|