This is an archive of the discontinued Mercurial Phabricator instance.

Differential D480

use full version of copytrace for draft branch rebases
AbandonedPublic

Authored by • goozie001 on Aug 22 2017, 6:00 PM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
stash
ryanmce
Group Reviewers
Restricted Project
Summary

on merge during rebase, check to see if source and destination are both draft commits. If so, use full copytrace to support more functionality.

Test Plan

In tests/test-copytrace.t, added two tests:

  • Change a file name and move containing directory in one branch. Modify contents of original file name in other branch. Rebase modded file into new file name in new directory.
  • Move directory in one merge parent. Add new file to original directory in other merge parent. File moved to new directory on rebase.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Test Errors

Event Timeline

• goozie001 created this revision.Aug 22 2017, 6:00 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 22 2017, 6:00 PM
ryanmce requested changes to this revision.Aug 23 2017, 4:51 AM
ryanmce added a subscriber: ryanmce.

Dupe of D481

This revision now requires changes to proceed.Aug 23 2017, 4:51 AM
• goozie001 abandoned this revision.Aug 24 2017, 4:52 PM

Revision Contents
Changeset List

PathPackages
Mhgext3rd/copytrace.py (21 lines)
Mtests/test-copytrace.t (182 lines)

Diff 1162

hgext3rd/copytrace.py

# (see _mergecopies docblock below). # (see _mergecopies docblock below).
# copytracing can be too slow if there are too # copytracing can be too slow if there are too
# many commits in this "branch". # many commits in this "branch".
sourcecommitlimit = 100 sourcecommitlimit = 100
# limits the number of heuristically found move candidates to check # limits the number of heuristically found move candidates to check
maxmovescandidatestocheck = 5 maxmovescandidatestocheck = 5
# whether to enable fast copytracing during amends (requires fastcopytrace) # whether to enable fast copytracing during amends (requires fastcopytrace
# to be enabled. # to be enabled.)
enableamendcopytrace = True enableamendcopytrace = True
# how many previous commits to search through when looking for amend # how many previous commits to search through when looking for amend
# copytrace data. # copytrace data.
amendcopytracecommitlimit = 100 amendcopytracecommitlimit = 100
''' '''
if not repo.ui.configbool("experimental", "disablecopytrace"): if not repo.ui.configbool("experimental", "disablecopytrace"):
# user explicitly enabled copytracing - use it # user explicitly enabled copytracing - use it
return orig(repo, cdst, csrc, base) return orig(repo, cdst, csrc, base)
if not _fastcopytraceenabled(repo.ui): if not _fastcopytraceenabled(repo.ui):
return orig(repo, cdst, csrc, base) return orig(repo, cdst, csrc, base)
if not cdst or not csrc or cdst == csrc: if _isfullcopytraceable(cdst, base):
return {}, {}, {}, {}, {} configoverrides = {('experimental', 'disablecopytrace'): False}
with repo.ui.configoverride(configoverrides, 'mergecopies'):
result = orig(repo, cdst, csrc, base)
return result
# avoid silly behavior for parent -> working dir # avoid silly behavior for parent -> working dir
if csrc.node() is None and cdst.node() == repo.dirstate.p1(): if csrc.node() is None and cdst.node() == repo.dirstate.p1():
return repo.dirstate.copies(), {}, {}, {}, {} return repo.dirstate.copies(), {}, {}, {}, {}
if cdst.rev() is None: if cdst.rev() is None:
cdst = cdst.p1() cdst = cdst.p1()
if csrc.rev() is None: if csrc.rev() is None:
if fctx.isabsent(): if fctx.isabsent():
return fctx._ctx return fctx._ctx
else: else:
return fctx._changectx return fctx._changectx
def _gethex(ctx): def _gethex(ctx):
# for workingctx return p1 hex # for workingctx return p1 hex
return ctx.hex() if ctx.hex() != node.wdirhex else ctx.p1().hex() return ctx.hex() if ctx.hex() != node.wdirhex else ctx.p1().hex()
def _isfullcopytraceable(cdst, base):
if cdst.phase() == phases.draft and base.phase() == phases.draft:
# draft branch: Use traditional copytracing if < 100 commits
ctx = cdst
commits = 0
while ctx != base and commits != 100:
ctx = ctx.p1()
commits += 1
return commits < 100

tests/test-copytrace.t

rebasing 2:5268f05aa168 "mod a" (tip) rebasing 2:5268f05aa168 "mod a" (tip)
merging b and a to b merging b and a to b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5268f05aa168-284f6515-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5268f05aa168-284f6515-rebase.hg (glob)
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Check a few potential move candidates Check a few potential move candidates
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ mkdir dir $ mkdir dir
$ echo a > dir/a $ echo a > dir/a
$ hg add dir/a $ hg add dir/a
$ hg ci -qm initial $ hg ci -qm initial
$ hg mv dir/a dir/b $ hg mv dir/a dir/b
$ hg ci -qm 'mv dir/a dir/b' $ hg ci -qm 'mv dir/a dir/b'
$ mkdir dir2 $ mkdir dir2
$ echo b > dir2/a $ echo b > dir2/a
$ hg add dir2/a $ hg add dir2/a
$ hg ci -qm 'create dir2/a' $ hg ci -qm 'create dir2/a'
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ hg up -q 0 $ hg up -q 0
$ echo b > dir/a $ echo b > dir/a
$ hg ci -qm 'mod dir/a' $ hg ci -qm 'mod dir/a'
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea
| desc: mod dir/a, phase: draft | desc: mod dir/a, phase: draft
| o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa
| | desc: create dir2/a, phase: draft | | desc: create dir2/a, phase: public
| o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade | o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade
|/ desc: mv dir/a dir/b, phase: draft |/ desc: mv dir/a dir/b, phase: public
o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944
desc: initial, phase: draft desc: initial, phase: public
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:6b2f4cece40f "mod dir/a" (tip) rebasing 3:6b2f4cece40f "mod dir/a" (tip)
merging dir/b and dir/a to dir/b merging dir/b and dir/a to dir/b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg (glob)
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
| desc: del a, phase: draft | desc: del a, phase: draft
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
|/ desc: mv a b, phase: draft |/ desc: mv a b, phase: draft
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: draft
$ hg rebase -s 1 -d 2 $ hg rebase -s 1 -d 2
rebasing 1:472e38d57782 "mv a b" rebasing 1:472e38d57782 "mv a b"
note: possible conflict - a was deleted and renamed to:
b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg (glob)
$ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
$ ls $ ls
b b
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Too many move candidates Too many move candidates
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ hg rm a $ hg rm a
$ echo a > b $ echo a > b
$ echo a > c $ echo a > c
$ echo a > d $ echo a > d
$ echo a > e $ echo a > e
$ echo a > f $ echo a > f
$ echo a > g $ echo a > g
$ hg add b $ hg add b
$ hg add c $ hg add c
$ hg add d $ hg add d
$ hg add e $ hg add e
$ hg add f $ hg add f
$ hg add g $ hg add g
$ hg ci -m 'rm a, add many files' $ hg ci -m 'rm a, add many files'
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ hg up -q ".^" $ hg up -q ".^"
$ echo b > a $ echo b > a
$ hg ci -m 'mod a' $ hg ci -m 'mod a'
created new head created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
| desc: mod a, phase: draft | desc: mod a, phase: draft
| o changeset: d133babe0b735059c360d36b4b47200cdd6bcef5 | o changeset: d133babe0b735059c360d36b4b47200cdd6bcef5
|/ desc: rm a, add many files, phase: draft |/ desc: rm a, add many files, phase: public
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b "mod a" (tip)
other [source] changed a which local [dest] deleted other [source] changed a 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. 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. Source control team is working on fixing this problem.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip) rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)
merging dir/a and dir2/a to dir2/a merging dir/a and dir2/a to dir2/a
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg (glob)
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Move file twice and rebase mod on top of moves Move file twice and rebase mod on top of moves
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ hg mv a b $ hg mv a b
$ hg ci -m 'mv a b' $ hg ci -m 'mv a b'
$ hg mv b c $ hg mv b c
$ hg ci -m 'mv b c' $ hg ci -m 'mv b c'
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ hg up -q 0 $ hg up -q 0
$ echo c > a $ echo c > a
$ hg ci -m 'mod a' $ hg ci -m 'mod a'
created new head created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
| desc: mod a, phase: draft | desc: mod a, phase: draft
| o changeset: d3efd280421d24f9f229997c19e654761c942a71 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
| | desc: mv b c, phase: draft | | desc: mv b c, phase: public
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
|/ desc: mv a b, phase: draft |/ desc: mv a b, phase: public
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:d41316942216 "mod a" (tip) rebasing 3:d41316942216 "mod a" (tip)
merging c and a to c merging c and a to c
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg (glob)
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
merging b and c to c merging b and c to c
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg (glob)
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Move one file and add another file in the same folder in one branch, modify file in another branch Move one file and add another file in the same folder in one branch, modify file in another branch
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ hg mv a b $ hg mv a b
$ hg ci -m 'mv a b' $ hg ci -m 'mv a b'
$ echo c > c $ echo c > c
$ hg add c $ hg add c
$ hg ci -m 'add c' $ hg ci -m 'add c'
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ hg up -q 0 $ hg up -q 0
$ echo b > a $ echo b > a
$ hg ci -m 'mod a' $ hg ci -m 'mod a'
created new head created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
| desc: mod a, phase: draft | desc: mod a, phase: draft
| o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9 | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9
| | desc: add c, phase: draft | | desc: add c, phase: public
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
|/ desc: mv a b, phase: draft |/ desc: mv a b, phase: public
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:ef716627c70b "mod a" (tip) rebasing 3:ef716627c70b "mod a" (tip)
merging b and a to b merging b and a to b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
$ ls $ ls
b b
c c
$ hg ci -m merge $ hg ci -m merge
$ ls $ ls
b b
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Copy and move file Copy and move file
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ hg cp a c $ hg cp a c
$ hg mv a b $ hg mv a b
$ hg ci -m 'cp a c, mv a b' $ hg ci -m 'cp a c, mv a b'
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ hg up -q 0 $ hg up -q 0
$ echo b > a $ echo b > a
$ hg ci -m 'mod a' $ hg ci -m 'mod a'
created new head created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
| desc: mod a, phase: draft | desc: mod a, phase: draft
| o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8 | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8
|/ desc: cp a c, mv a b, phase: draft |/ desc: cp a c, mv a b, phase: public
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b "mod a" (tip)
merging b and a to b merging b and a to b
merging c and a to c merging c and a to c
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
$ ls $ ls
b b
c c
$ cat b $ cat b
b b
$ cat c $ cat c
b b
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Do a merge commit with many consequent moves in one branch Do a merge commit with many consequent moves in one branch
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ echo b > a $ echo b > a
$ hg ci -qm 'mod a' $ hg ci -qm 'mod a'
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ hg up -q ".^" $ hg up -q ".^"
$ hg mv a b $ hg mv a b
$ hg ci -qm 'mv a b' $ hg ci -qm 'mv a b'
$ hg mv b c $ hg mv b c
$ hg ci -qm 'mv b c' $ hg ci -qm 'mv b c'
$ hg up -q 1 $ hg up -q 1
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
o changeset: d3efd280421d24f9f229997c19e654761c942a71 o changeset: d3efd280421d24f9f229997c19e654761c942a71
| desc: mv b c, phase: draft | desc: mv b c, phase: draft
o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
| desc: mv a b, phase: draft | desc: mv a b, phase: draft
| @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
|/ desc: mod a, phase: draft |/ desc: mod a, phase: public
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ hg merge 3 $ hg merge 3
merging a and c to c merging a and c to c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -qm 'merge' $ hg ci -qm 'merge'
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825 @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825
|\ desc: merge, phase: draft |\ desc: merge, phase: draft
| o changeset: d3efd280421d24f9f229997c19e654761c942a71 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
| | desc: mv b c, phase: draft | | desc: mv b c, phase: draft
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
| | desc: mv a b, phase: draft | | desc: mv a b, phase: draft
o | changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e o | changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
|/ desc: mod a, phase: draft |/ desc: mod a, phase: public
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ ls $ ls
c c
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Test shelve/unshelve Test shelve/unshelve
$ hg init repo $ hg init server
$ initclient repo $ initclient server
$ cd repo $ cd server
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ cd ..
$ hg clone -q server repo
$ initclient repo
$ cd repo
$ echo b > a $ echo b > a
$ hg shelve $ hg shelve
shelved as default shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv a b $ hg mv a b
$ hg ci -m 'mv a b' $ hg ci -m 'mv a b'
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
| desc: mv a b, phase: draft | desc: mv a b, phase: draft
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial, phase: draft desc: initial, phase: public
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 2:45f63161acea "changes to: initial" (tip) rebasing 2:45f63161acea "changes to: initial" (tip)
merging b and a to b merging b and a to b
$ ls $ ls
b b
$ cat b $ cat b
b b
$ cd .. $ cd ..
$ rm -rf server $ rm -rf server
$ rm -rf repo $ rm -rf repo
Test full copytrace ability on draft branch: File directory and base name
changed in same move
$ hg init repo
$ initclient repo
$ mkdir repo/dir1
$ cd repo/dir1
$ echo a > a
$ hg add a
$ hg ci -qm initial
$ cd ..
$ hg mv -q dir1 dir2
$ hg mv dir2/a dir2/b
$ hg ci -qm 'mv a b; mv dir1 dir2'
$ hg up -q '.^'
$ cd dir1
$ echo b >> a
$ cd ..
$ hg ci -qm 'mod a'
$ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n'
@ changeset 6207d2d318e710b882e3d5ada2a89770efc42c96
| desc mod a, phase: draft
| o changeset abffdd4e3dfc04bc375034b970299b2a309a1cce
|/ desc mv a b; mv dir1 dir2, phase: draft
o changeset 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3
desc initial, phase: draft
$ hg rebase -s . -d 1
rebasing 2:6207d2d318e7 "mod a" (tip)
merging dir2/b and dir1/a to dir2/b
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg (glob)
$ cat dir2/b
a
b
$ cd ..
$ rm -rf server
$ rm -rf repo
Test full copytrace ability on draft branch: Move directory in one merge parent,
while adding file to original directory in other merge parent. File moved on rebase.
$ hg init repo
$ initclient repo
$ mkdir repo/dir1
$ cd repo/dir1
$ echo dummy > dummy
$ hg add dummy
$ cd ..
$ hg ci -qm initial
$ cd dir1
$ echo a > a
$ hg add a
$ cd ..
$ hg ci -qm 'hg add dir1/a'
$ hg up -q '.^'
$ hg mv -q dir1 dir2
$ hg ci -qm 'mv dir1 dir2'
$ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n'
@ changeset e8919e7df8d036e07b906045eddcd4a42ff1915f
| desc mv dir1 dir2, phase: draft
| o changeset 7c7c6f339be00f849c3cb2df738ca91db78b32c8
|/ desc hg add dir1/a, phase: draft
o changeset a235dcce55dcf42034c4e374cb200662d0bb4a13
desc initial, phase: draft
$ hg rebase -s . -d 1
rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg (glob)
$ ls dir2
a
dummy
$ rm -rf server
$ rm -rf repo