Commit Graph

11 Commits

Author SHA1 Message Date
Matt Mackall
6b5e168d5c Fix up parent display in logging
For changesets with a first parent nullid, but not rev 0, we ought to
display a null parent.
2006-11-07 14:04:15 -06:00
Vadim Gelfer
dfe0de6855 add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed.  this makes
tiny change to ssh wire protocol, but change is backwards compatible.

pull command now returns 0 if no changes to pull.
2006-03-29 10:27:16 -08:00
Vadim Gelfer
afbdf5b7ea update test for unrelated repo. 2006-03-14 23:00:45 -08:00
Thomas Arendsen Hein
1b244c77c7 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Some systems show "Thu Jan 01" instead of "Thu Jan  1", which breaks tests.
Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on
all systems.
2006-03-13 13:05:41 +01:00
mpm@selenic.com
4eda11f6dc Update tests 2005-08-24 19:19:35 -07:00
Samuel Tardieu
c5def6fc1c [PATCH] Print timezone offset when outputting dates
Example:

% hg log | head -12
changeset:   791:41440890e57d2dbacde03a2a114e5114a031ea4a
tag:         tip
user:        Samuel Tardieu <sam@rfc1149.net>
date:        Mon Jul 25 13:24:15 2005 +0200
summary:     Parse various date formats when accepting user specified dates
[...]
changeset:   787:ba5c2021364ee876dae170e8f153e43bd0b2bd73
parent:      785:31a80e3723cee0a5991340facb2707e71983eb41
user:        Bryan O'Sullivan <bos@serpentine.com>
date:        Sun Jul 24 00:39:24 2005 -0800
summary:     Get "forget" command to use new walk code.
[...]
2005-08-19 23:23:42 -08:00
mpm@selenic.com
ea7bd9ea6f run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
2005-08-16 19:03:01 -08:00
Thomas Arendsen Hein
87aabef405 Updated output of tests. 2005-07-29 15:21:02 +01:00
mpm@selenic.com
e77f03935e Fix tests for short changeset hashes and hidden manifest hashes 2005-07-27 10:21:19 -08:00
mpm@selenic.com
907e714bb6 Fix up test results
No more errnos
diff | sed changes
.out message ok
2005-07-26 19:23:59 -08:00
mpm@selenic.com
ecca3da73a Actually warn on pulling from an unrelated repository
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Actually warn on pulling from an unrelated repository

add some comments to findincoming
track the base nodes of the fetch set
report if the base set only contains nullid
add a test case

manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j
ClLpn0dKZnB46dh0F8zhuuk=
=emNb
-----END PGP SIGNATURE-----
2005-07-02 18:25:15 -08:00