Mercurial > hg
comparison tests/test-flags.t @ 18334:44bda93df90e
merge: changing the mode of a file is also an update
It was a change in the file system that wasn't reported in the summaries.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 10 Jan 2013 00:44:23 +0100 |
| parents | b87acfda5268 |
| children | 557c8522aec0 |
comparison
equal
deleted
inserted
replaced
| 18333:f6f23ecafc9b | 18334:44bda93df90e |
|---|---|
| 77 summary: added a b | 77 summary: added a b |
| 78 | 78 |
| 79 | 79 |
| 80 $ hg -v merge | 80 $ hg -v merge |
| 81 resolving manifests | 81 resolving manifests |
| 82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 83 (branch merge, don't forget to commit) | 83 (branch merge, don't forget to commit) |
| 84 | 84 |
| 85 $ cd ../test3 | 85 $ cd ../test3 |
| 86 $ echo 123 >>b | 86 $ echo 123 >>b |
| 87 $ hg ci -m "b updated" | 87 $ hg ci -m "b updated" |
| 126 summary: added a b | 126 summary: added a b |
| 127 | 127 |
| 128 | 128 |
| 129 $ hg -v merge | 129 $ hg -v merge |
| 130 resolving manifests | 130 resolving manifests |
| 131 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 131 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 132 (branch merge, don't forget to commit) | 132 (branch merge, don't forget to commit) |
| 133 | 133 |
| 134 $ ls -l ../test[123]/a > foo | 134 $ ls -l ../test[123]/a > foo |
| 135 $ cut -b 1-10 < foo | 135 $ cut -b 1-10 < foo |
| 136 -rwxr-x--- | 136 -rwxr-x--- |