diff options
Diffstat (limited to 'tests/test-convert-hg-source.t')
| -rw-r--r-- | tests/test-convert-hg-source.t | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t index a39b2b7..919d83e 100644 --- a/tests/test-convert-hg-source.t +++ b/tests/test-convert-hg-source.t @@ -1,3 +1,4 @@ + $ cat >> $HGRCPATH <<EOF > [extensions] > convert= @@ -17,7 +18,7 @@ $ hg ci -m 'make bar and baz copies of foo' -d '2 0' created new head $ hg bookmark premerge1 - $ hg merge -r 1 + $ hg merge merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -31,11 +32,7 @@ (branch merge, don't forget to commit) $ hg ci -m 'merge remote copy' -d '4 0' created new head -#if execbit $ chmod +x baz -#else - $ echo some other change to make sure we get a rev 5 > baz -#endif $ hg ci -m 'mark baz executable' -d '5 0' $ cd .. $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' @@ -56,16 +53,9 @@ searching for changes no changes found [1] -#if execbit $ hg bookmarks premerge1 3:973ef48a98a4 premerge2 5:13d9b87cf8f8 -#else -Different hash because no x bit - $ hg bookmarks - premerge1 3:973ef48a98a4 - premerge2 5:df0779bcf33c -#endif $ cd .. check shamap LF and CRLF handling |