Mercurial > hg > mercurial-crew-with-dirclash

annotate .hgsigs @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 5d8f5ad45c12
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2253
ccd5f17f1eea Added signature for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 35fb62a3a673d5322f6274a44ba6456e5e4b3b37 0 iD8DBQBEYmO2ywK+sNU5EO8RAnaYAKCO7x15xUn5mnhqWNXqk/ehlhRt2QCfRDfY0LrUq2q4oK/KypuJYPHgq1A=
2660
ad329294d808 Added signature for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9
Matt Mackall <mpm@selenic.com>
parents: 2253
diff changeset
2 2be3001847cb18a23c403439d9e7d0ace30804e9 0 iD8DBQBExUbjywK+sNU5EO8RAhzxAKCtyHAQUzcTSZTqlfJ0by6vhREwWQCghaQFHfkfN0l9/40EowNhuMOKnJk=
3867
d210a1b05cf6 Added signature for changeset 36a957364b1b89c150f2d0e60a99befe0ee08bd3
Matt Mackall <mpm@selenic.com>
parents: 2660
diff changeset
3 36a957364b1b89c150f2d0e60a99befe0ee08bd3 0 iD8DBQBFfL2QywK+sNU5EO8RAjYFAKCoGlaWRTeMsjdmxAjUYx6diZxOBwCfY6IpBYsKvPTwB3oktnPt5Rmrlys=
3927
93e5f07baf75 Added signature for changeset 27230c29bfec36d5540fbe1c976810aefecfd1d2
Matt Mackall <mpm@selenic.com>
parents: 3867
diff changeset
4 27230c29bfec36d5540fbe1c976810aefecfd1d2 0 iD8DBQBFheweywK+sNU5EO8RAt7VAKCrqJQWT2/uo2RWf0ZI4bLp6v82jACgjrMdsaTbxRsypcmEsdPhlG6/8F4=
4725
cf8b8f62688a Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694
Matt Mackall <mpm@selenic.com>
parents: 3927
diff changeset
5 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0 iD8DBQBGgHicywK+sNU5EO8RAgNxAJ0VG8ixAaeudx4sZbhngI1syu49HQCeNUJQfWBgA8bkJ2pvsFpNxwYaX3I=
5474
5d8f5ad45c12 Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
Matt Mackall <mpm@selenic.com>
parents: 4725
diff changeset
6 23889160905a1b09fffe1c07378e9fc1827606eb 0 iD8DBQBHGTzoywK+sNU5EO8RAr/UAJ0Y8s4jQtzgS+G9vM8z6CWBThZ8fwCcCT5XDj2XwxKkz/0s6UELwjsO3LU=