mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
274bce0c1c
This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
46 lines
691 B
Bash
Executable File
46 lines
691 B
Bash
Executable File
#!/bin/sh
|
|
|
|
mkdir t
|
|
cd t
|
|
hg init
|
|
echo "added file1" > file1
|
|
echo "another line of text" >> file1
|
|
echo "added file2" > file2
|
|
hg add file1 file2
|
|
hg commit -m "added file1 and file2" -d "1000000 0" -u user
|
|
echo "changed file1" >> file1
|
|
hg commit -m "changed file1" -d "1000000 0" -u user
|
|
hg -q log
|
|
hg id
|
|
hg update -C 0
|
|
hg id
|
|
echo "changed file1" >> file1
|
|
hg id
|
|
hg revert --no-backup --all
|
|
hg diff
|
|
hg status
|
|
hg id
|
|
hg update
|
|
hg diff
|
|
hg status
|
|
hg id
|
|
hg update -C 0
|
|
echo "changed file1 different" >> file1
|
|
hg update
|
|
hg diff --nodates
|
|
hg status
|
|
hg id
|
|
hg revert --no-backup --all
|
|
hg diff
|
|
hg status
|
|
hg id
|
|
hg revert -r tip --no-backup --all
|
|
hg diff
|
|
hg status
|
|
hg id
|
|
hg update -C
|
|
hg diff
|
|
hg status
|
|
hg id
|
|
|