mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
18 lines
420 B
Bash
Executable File
18 lines
420 B
Bash
Executable File
#!/bin/sh
|
|
HG=hg
|
|
"$HG" init
|
|
mkdir b
|
|
echo 'Bouncy' >b/bouncy
|
|
echo 'tricycle' >b/vehicle
|
|
"$HG" add b/bouncy
|
|
"$HG" add b/vehicle
|
|
"$HG" commit -m 'Adding bouncy'
|
|
echo 'bouncy' >>b/bouncy
|
|
"$HG" commit -m 'Making it bouncier'
|
|
"$HG" update -C 0
|
|
echo 'stationary' >>b/vehicle
|
|
"$HG" commit -m 'Clarifying the vehicle.'
|
|
"$HG" update -C 1
|
|
chmod a-w b/vehicle
|
|
"$HG" merge 2 2>&1 | sed 's|^\(.*[ ]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g'
|