| Subject: | svk is not storing merge points. |
it seems that svk is not updating merge points at all. Methods of merge:
svk br --merge trunk QA
svk sm
svk merge
All seem not to effect the last merged point, even though there is stuff
in both the logs and the svk:merge prop
benh@noodleboy:~/mirror/site/branches/QA$ svk propget svk:merge
//mirror/site/branches/QA
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/BakerTaylor:44699
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/bookpress:46118
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/libri_bulk:44671
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/obb:46796
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/redesign:46364
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/sections:45037
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/subscription-order:45547
19187406-8fba-622a-9e46-a6a8f9651bd9:/branches/wishlist:47018
19187406-8fba-622a-9e46-a6a8f9651bd9:/trunk:47154
benh@noodleboy:~/mirror/site/branches/QA$ svk log -l 10
----------------------------------------------------------------------
Show quoted text
---snip 9 log entries---
r47730 (orig r47174): jeffs | 2008-10-31 14:54:46 -0700
- Merge //mirror/site/trunk to //mirror/site/branches/QA
----------------------------------------------------------------------
benh@noodleboy:~/mirror/site/branches/QA$ svk br
Project name: site
Branch: QA (online)
Revision: 47762
Repository path: //mirror/site/branches/QA
Copied From: trunk@44615
Merged From: trunk@44615
benh@noodleboy:~/mirror/site/branches/QA$ svk merge -r47730:HEAD
//mirror/site/trunk //mirror/site/branches/QA -C
---snip---
benh@noodleboy:~/mirror/site/branches/QA$ svk merge -r47730:HEAD
//mirror/site/trunk //mirror/site/branches/QA
Waiting for editor...
---snip---
Committed revision 47763.
benh@noodleboy:~/mirror/site/branches/QA$ svk br
Project name: site
Branch: QA (online)
Revision: 47762
Repository path: //mirror/site/branches/QA
Copied From: trunk@44615
Merged From: trunk@44615
benh@noodleboy:~/mirror/site/branches/QA$
--
benh~