mpm@selenic.com
aea9850302
Make prompting go
...
Minor UI tweaking
Add merge prompting
2005-05-18 18:25:37 -08:00
mpm@selenic.com
fb1218fe40
Add paranoia to diff code
2005-05-18 16:59:54 -08:00
mpm@selenic.com
785f7947d7
Add updated merge3 code
2005-05-18 16:45:44 -08:00
mpm@selenic.com
2bbb8b5a72
Beginnings of transaction undo support
2005-05-18 16:31:51 -08:00
mpm@selenic.com
7e5280f30b
Refactor merge code
...
Delete old code
Fix calculation of newer nodes on server
Fix branch recursion on client
Fix manifest merge problems
Add more debugging and note messages to merge
2005-05-18 16:29:39 -08:00
mpm@selenic.com
060e7fe13f
Fix manifest merge swap bug
...
Add more debug info to merge
2005-05-17 13:38:21 -08:00
mpm@selenic.com
ca952e3eda
Fix merge bug, I hope
2005-05-17 11:40:45 -08:00
mpm@selenic.com
77028dbcc6
Add -q quiet option
...
Make -d and -v do something
Add a bunch of debug and note messages
2005-05-17 11:06:59 -08:00
mpm@selenic.com
08e7e95781
Add basic annotation support
...
filelog.annotate() will get the change number on each line.
Singed-Off-by: Christopher Li<hg@chrisli.org>
2005-05-17 01:12:30 -08:00
mpm@selenic.com
f16efef9d1
Add "HG: merge resolve" to editor text for merge
2005-05-17 01:07:57 -08:00
mpm@selenic.com
7c6f4b49c8
Add tag support
2005-05-13 13:12:32 -08:00
mpm@selenic.com
d9094f35ef
Fix up a bunch of bugs in the new merge code
...
Move getchangegroup/addchangegroup to generators
2005-05-13 11:47:16 -08:00
mpm@selenic.com
264f689db9
Diff in subdirectories from Jake Edge
...
Dates in diff
Fix O(n^2) behaviour of manifest diff
Add a/ and b/ to work with patch -p1
2005-05-12 17:54:55 -08:00
mpm@selenic.com
f6de60c79e
Add hg:// protocol
...
Fix some of the getchangegroup logic
2005-05-12 01:21:58 -08:00
mpm@selenic.com
27770f7f5d
Add getchangegroup code to efficiently calculate and request a changegroup
2005-05-11 15:06:41 -08:00
mpm@selenic.com
1171a0a7b6
From: Thomas Arendsen Hein <thomas@intevation.de>
...
Good. Attached is a patch which also tries to use $EMAIL as the
commit user and removed a try/except by using os.environ.get.
2005-05-11 14:38:26 -08:00
mpm@selenic.com
40a6faf20b
Fix resolve bug putting unchanged files in resolve cset
2005-05-11 09:44:12 -08:00
mpm@selenic.com
8bd85e1add
Add changegroup support
2005-05-10 00:40:49 -08:00
mpm@selenic.com
af712781e7
Fix occassional diff bug with manifests
2005-05-10 00:33:48 -08:00
mpm@selenic.com
c99659b446
Date is an int as a string in changelog
2005-05-07 16:33:09 -08:00
mpm@selenic.com
90b1458af6
Move hex/bin bits to revlog
...
Handle lookup of rev -1 of changelog
2005-05-07 16:12:31 -08:00
mpm@selenic.com
ec57dd3c61
Support for 0, 1, or 2 diff revs
2005-05-07 09:27:52 -08:00
mpm@selenic.com
6d687f705b
Add diffrevs function to compare two nodes
2005-05-06 09:09:35 -08:00
mpm@selenic.com
daf47e9d59
Fix up commit arg breakage
2005-05-05 15:20:56 -08:00
mpm@selenic.com
e36ca808fb
Make diffdir take a revision argument
2005-05-05 15:05:50 -08:00
mpm@selenic.com
fc0d37860b
Fix corruption from manifest.listcache optimization
...
Put the remove edit text in the right place
2005-05-04 22:47:25 -08:00
mpm@selenic.com
1fb1f1ae9a
The actual hg remove fix from Thomas Hein
2005-05-04 15:42:30 -08:00
mpm@selenic.com
1e4e38aea7
From: Thomas Arendsen Hein <thomas@intevation.de>
...
mercurial 0.4d had the same problems with removing files, but
attached is a patch which fixes that problem.
The key change is in dircache.remove():
del self[f] should have been del self.map[f]
This error was hidden by the 'except: pass' statement.
2005-05-04 15:32:16 -08:00
mpm@selenic.com
e35c6e552f
Fix network pull of repo files with "%" in their base64 encoding.
2005-05-04 10:07:10 -08:00
oxymoron@cinder.waste.org
c7e0bb4f93
Fix linking of changeset revs when merging
2005-05-03 23:37:43 -08:00
mpm@selenic.com
b713cdf587
Ignore empty ignore patterns
2005-05-03 18:51:52 -08:00
mpm@selenic.com
45bf6cd115
Fix exception handling for reading current working version
2005-05-03 18:36:16 -08:00
mpm@selenic.com
ca8cb8ba67
Add back links from file revisions to changeset revisions
...
Add simple transaction support
Add hg verify
Improve caching in revlog
Fix a bunch of bugs
Self-hosting now that the metadata is close to finalized
2005-05-03 13:16:10 -08:00
