fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
b6a988b
)
Szybki bug fix w RAL.
author
Łukasz Rekucki
<lrekucki@gmail.com>
Thu, 8 Oct 2009 13:35:15 +0000
(15:35 +0200)
committer
Łukasz Rekucki
<lrekucki@gmail.com>
Thu, 8 Oct 2009 13:35:15 +0000
(15:35 +0200)
lib/wlrepo/mercurial_backend/document.py
patch
|
blob
|
history
diff --git
a/lib/wlrepo/mercurial_backend/document.py
b/lib/wlrepo/mercurial_backend/document.py
index
e714561
..
d1c3e53
100644
(file)
--- a/
lib/wlrepo/mercurial_backend/document.py
+++ b/
lib/wlrepo/mercurial_backend/document.py
@@
-115,7
+115,8
@@
class MercurialDocument(wlrepo.Document):
return (True, False)
- return self._revision.merge_with(sv._revision, user=user)
+ return self._revision.merge_with(sv._revision, user=user,
+ message="$AUTO$ Personal branch update.")
finally:
lock.release()