Mercurial bug (?)

Manolis Kiagias sonic2000gr at gmail.com
Mon Feb 9 20:41:50 EET 2009


Νομίζω πως μόλις χτύπησα ένα:

[sonic at joshua:~/freebsd-book]$ hg log |head
changeset:   1457:102f25fc948b
tag:         tip
user:        Manolis Kiagias <sonicy at otenet.gr>
date:        Mon Feb 09 20:26:18 2009 +0200
summary:     Continue translation of section 30.5 (firewalls)

changeset:   1456:09e2ec46b792
user:        Manolis Kiagias <sonicy at otenet.gr>
date:        Mon Feb 09 20:18:13 2009 +0200
summary:     Minor markup enhancement (en_US firewalls)

[sonic at joshua:~/freebsd-book]$ hg commit
nothing changed

[sonic at joshua:~/freebsd-book]$ hg pull ../freebsd-doc-keramida/
pulling from ../freebsd-doc-keramida/
searching for changes
adding changesets
adding manifests
adding file changes
added 22 changesets with 24 changes to 10 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)

[sonic at joshua:~/freebsd-book]$ hg merge
abort: outstanding uncommitted changes

... που δεν υπάρχουν ;)

Κάνοντας clone  το freebsd-book μπορώ να κάνω pull και merge χωρίς
πρόβλημα... What gives?




More information about the Freebsd-doc-el mailing list