equal
deleted
inserted
replaced
56 cat ../.hg/patches/p |
56 cat ../.hg/patches/p |
57 |
57 |
58 echo '% qnew -u with no username configured' |
58 echo '% qnew -u with no username configured' |
59 HGUSER= hg qnew -u blue red |
59 HGUSER= hg qnew -u blue red |
60 cat ../.hg/patches/red |
60 cat ../.hg/patches/red |
|
61 |
|
62 echo '% fail when trying to import a merge' |
|
63 hg init merge |
|
64 cd merge |
|
65 touch a |
|
66 hg ci -Am null |
|
67 echo a >> a |
|
68 hg ci -m a |
|
69 hg up -r 0 |
|
70 echo b >> a |
|
71 hg ci -m b |
|
72 hg merge -f 1 |
|
73 hg resolve --mark a |
|
74 hg qnew -f merge |
|
75 |
|
76 exit 0 |