Mercurial Mercurial > test / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.hgtags
author Matt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
branchstable
changeset 571 4895a3df2098
parent 200 7eae2cfd26fa
permissions -rw-r--r--
merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right? [ original upstream message ]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22
bd97d6fde324 Added tag universal_scheme for changeset 536c1797202d
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset 
     1
 
536c1797202d57efb77bea098e10968ff01602ce universal_scheme
43
fe5d9b9e78fc Added tag cvs_scheme for changeset ba000e29ecf3
Christian Ebert <blacktrash@gmx.net>
parents: 22
diff changeset 
     2
 
ba000e29ecf3b8df09e0fd363a78cabbe3c2a78f cvs_scheme
62
736ff2dde308 Added tag r0.1 for changeset 1fe48bf82d05
Christian Ebert <blacktrash@gmx.net>
parents: 43
diff changeset 
     3
 
1fe48bf82d056f1ece05baccab888357c10c5ab8 r0.1
91
04c899130750 Added tag very_cvs for changeset 2e930f842242
Christian Ebert <blacktrash@gmx.net>
parents: 85
diff changeset 
     4
 
2e930f84224222ad6514a3c5dc6e00350e199e92 very_cvs
125
e09b070073b2 Added tag hgkw_standalone_setup for changeset 99dc49c5bcfb
Christian Ebert <blacktrash@gmx.net>
parents: 91
diff changeset 
     5
 
99dc49c5bcfba9d5b412c5fa6d0bf3ba20d68df1 hgkw_standalone_setup
130
8b9912865921 Added tag nohook for changeset 15e8cd7f5295
Christian Ebert <blacktrash@gmx.net>
parents: 125
diff changeset 
     6
 
15e8cd7f5295728b089fc8ba236c0f079572fb1d nohook
150
ba5cb61db7a0 Added tag archive for changeset 0c8b7e5c25a6
Christian Ebert <blacktrash@gmx.net>
parents: 130
diff changeset 
     7
 
0c8b7e5c25a6b9a0d2782eaa3748eb546f5a254f archive
194
2a51062ecc60 Removed tag universal_scheme
Christian Ebert <blacktrash@gmx.net>
parents: 150
diff changeset 
     8
 
0000000000000000000000000000000000000000 universal_scheme
195
17bd1f7ca3be Removed tag cvs_scheme
Christian Ebert <blacktrash@gmx.net>
parents: 194
diff changeset 
     9
 
0000000000000000000000000000000000000000 cvs_scheme
196
aebd144f03f2 Removed tag r0.1
Christian Ebert <blacktrash@gmx.net>
parents: 195
diff changeset 
    10
 
0000000000000000000000000000000000000000 r0.1
197
87f5b5365b76 Removed tag very_cvs
Christian Ebert <blacktrash@gmx.net>
parents: 196
diff changeset 
    11
 
0000000000000000000000000000000000000000 very_cvs
198
99ab1bcffa67 Removed tag hgkw_standalone_setup
Christian Ebert <blacktrash@gmx.net>
parents: 197
diff changeset 
    12
 
0000000000000000000000000000000000000000 hgkw_standalone_setup
199
d07c6297d4bb Removed tag nohook
Christian Ebert <blacktrash@gmx.net>
parents: 198
diff changeset 
    13
 
0000000000000000000000000000000000000000 nohook
200
7eae2cfd26fa Removed tag archive
Christian Ebert <blacktrash@gmx.net>
parents: 199
diff changeset 
    14
 
0000000000000000000000000000000000000000 archive
test