repo.or.cz
/
git-darcs-import.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Follow upstream changes -- rest
[git-darcs-import.git]
/
tests
/
rmconflict.sh
blob
3bfc3c042d3afe2ec5228f7743d84266eeece3de
1
#!/usr/bin/env bash
2
set -ev
3
4
rm
-rf
tempA tempB
5
mkdir tempA tempB
6
cd
tempA
7
darcs init
8
touch
foo
9
darcs add foo
10
darcs record
-a -m
addA
-A
x
11
cd
..
/
tempB
12
darcs init
13
darcs pull
-a
..
/
tempA
14
darcs remove foo
15
# rm foo
16
darcs record
-a -m
rmB
-A
x
17
cd
..
/
tempA
18
darcs remove foo
19
darcs record
-a -m
rmA
-A
x
20
cd
..
/
tempB
21
darcs pull
-a
..
/
tempA
22
cd
..
23
rm
-rf
tempA tempB
24