Mercurial > hg
comparison tests/test-mq-merge.out @ 10775:c52057614c72 stable
Tests with spaces in paths
This allows most tests to succeed with
./run-tests.py --tmpdir='/tmp/hg test'
and introduces other tests for spaces and shell quoting
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 24 Mar 2010 01:43:24 +0100 |
parents | 8cb81d75730c |
children |
comparison
equal
deleted
inserted
replaced
10772:1e819576e926 | 10775:c52057614c72 |
---|---|
1 adding a | 1 adding a |
2 adding b | 2 adding b |
3 copy .hg/patches to .hg/patches.1 | |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5 M b | 4 M b |
6 created new head | 5 created new head |
7 a | 6 a |
8 b | 7 b |
9 merging with queue at: .hg/patches.1 | |
10 applying rm_a | 8 applying rm_a |
11 now at: rm_a | 9 now at: rm_a |
12 b | 10 b |
13 popping rm_a | 11 popping rm_a |
14 popping .hg.patches.merge.marker | 12 popping .hg.patches.merge.marker |