mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
f5a37c37de
This can make a difference when there are filters involved and decode(encode(working-dir-data)) != working-dir-data even though encode(decode(repo-data)) == repo-data An example is a working dir file that uses only \n when you're using the win32text extension.
44 lines
586 B
Bash
Executable File
44 lines
586 B
Bash
Executable File
#!/bin/sh
|
|
|
|
hg init repo
|
|
cd repo
|
|
|
|
echo foo > foo
|
|
echo bar > bar
|
|
hg ci -qAm 'add foo bar'
|
|
|
|
echo foo2 >> foo
|
|
echo bleh > bar
|
|
hg ci -m 'change foo bar'
|
|
|
|
hg up -qC 0
|
|
hg mv foo foo1
|
|
echo foo1 > foo1
|
|
hg cat foo >> foo1
|
|
hg ci -m 'mv foo foo1'
|
|
|
|
hg merge
|
|
hg debugstate --nodates
|
|
hg st -q
|
|
|
|
echo '% removing foo1 and bar'
|
|
cp foo1 F
|
|
cp bar B
|
|
hg rm -f foo1 bar
|
|
hg debugstate --nodates
|
|
hg st -qC
|
|
|
|
echo '% readding foo1 and bar'
|
|
cp F foo1
|
|
cp B bar
|
|
hg add -v foo1 bar
|
|
hg debugstate --nodates
|
|
hg st -qC
|
|
|
|
echo '% reverting foo1 and bar'
|
|
hg revert -vr . foo1 bar
|
|
hg debugstate --nodates
|
|
hg st -qC
|
|
hg diff
|
|
|