comparison tests/test-commit-amend.t @ 24229:f903689680e6

test-commit-amend: add globs for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 08 Mar 2015 00:04:03 -0500
parents ac41aa4a66ab
children 1ef96a3b8b89 ed18f4acf435
comparison
equal deleted inserted replaced
24228:542c891274b2 24229:f903689680e6
1094 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1094 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1095 (branch merge, don't forget to commit) 1095 (branch merge, don't forget to commit)
1096 $ hg ci -m add 1096 $ hg ci -m add
1097 $ 1097 $
1098 $ hg debugrename newdirname/newfile.py 1098 $ hg debugrename newdirname/newfile.py
1099 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def 1099 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
1100 $ hg status -C --change . 1100 $ hg status -C --change .
1101 A newdirname/newfile.py 1101 A newdirname/newfile.py
1102 $ hg status -C --rev 1 1102 $ hg status -C --rev 1
1103 A newdirname/newfile.py 1103 A newdirname/newfile.py
1104 $ hg status -C --rev 2 1104 $ hg status -C --rev 2
1113 0 0 88 0 3 34a4d536c0c0 000000000000 000000000000 1113 0 0 88 0 3 34a4d536c0c0 000000000000 000000000000
1114 1114
1115 $ echo a >> newdirname/commonfile.py 1115 $ echo a >> newdirname/commonfile.py
1116 $ hg ci --amend -m bug 1116 $ hg ci --amend -m bug
1117 $ hg debugrename newdirname/newfile.py 1117 $ hg debugrename newdirname/newfile.py
1118 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def 1118 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
1119 $ hg debugindex newdirname/newfile.py 1119 $ hg debugindex newdirname/newfile.py
1120 rev offset length base linkrev nodeid p1 p2 1120 rev offset length base linkrev nodeid p1 p2
1121 0 0 88 0 3 34a4d536c0c0 000000000000 000000000000 1121 0 0 88 0 3 34a4d536c0c0 000000000000 000000000000
1122 1122