Mercurial > hg
comparison tests/test-glog.out @ 6385:0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 24 Mar 2008 15:36:56 -0700 |
parents | 4b0c9c674707 |
children | d76f64cd4cb2 |
comparison
equal
deleted
inserted
replaced
6384:8bc876e03143 | 6385:0d4e068e9e52 |
---|---|
1 % init | 1 % init |
2 % empty repo | 2 % empty repo |
3 % building tree | 3 % building tree |
4 created new head | 4 (the rawcommit command is deprecated) |
5 created new head | 5 (the rawcommit command is deprecated) |
6 created new head | 6 (the rawcommit command is deprecated) |
7 created new head | 7 (the rawcommit command is deprecated) |
8 created new head | 8 (the rawcommit command is deprecated) |
9 (the rawcommit command is deprecated) | |
10 (the rawcommit command is deprecated) | |
11 (the rawcommit command is deprecated) | |
12 (the rawcommit command is deprecated) | |
13 (the rawcommit command is deprecated) | |
14 (the rawcommit command is deprecated) | |
15 (the rawcommit command is deprecated) | |
16 (the rawcommit command is deprecated) | |
17 (the rawcommit command is deprecated) | |
18 (the rawcommit command is deprecated) | |
19 (the rawcommit command is deprecated) | |
20 (the rawcommit command is deprecated) | |
21 (the rawcommit command is deprecated) | |
22 (the rawcommit command is deprecated) | |
23 (the rawcommit command is deprecated) | |
24 (the rawcommit command is deprecated) | |
25 (the rawcommit command is deprecated) | |
26 (the rawcommit command is deprecated) | |
27 (the rawcommit command is deprecated) | |
28 (the rawcommit command is deprecated) | |
29 (the rawcommit command is deprecated) | |
30 (the rawcommit command is deprecated) | |
31 (the rawcommit command is deprecated) | |
32 (the rawcommit command is deprecated) | |
33 (the rawcommit command is deprecated) | |
34 (the rawcommit command is deprecated) | |
35 (the rawcommit command is deprecated) | |
36 (the rawcommit command is deprecated) | |
37 (the rawcommit command is deprecated) | |
38 (the rawcommit command is deprecated) | |
9 % glog -q | 39 % glog -q |
10 @ 34:0eed7cd895e0 | 40 @ 34:0eed7cd895e0 |
11 | | 41 | |
12 | o 33:2e9d1b521374 | 42 | o 33:2e9d1b521374 |
13 | | | 43 | | |