| Subject: | Recording empty merges can be useful |
| Date: | Mon, 17 Sep 2007 09:16:26 -0400 |
| To: | bug-svk [...] rt.cpan.org |
| From: | Daniel Jacobowitz <drow [...] false.org> |
We have two branches in our depot - trunk and stable. We do some work
on trunk, and then at release time, we smerge trunk to stable. Bug
fixes to the stable code are applied to stable and then smerged to
trunk.
The merges from trunk to stable tend to be big. Afterwards, we want
to do a merge from stable to trunk to update the merge point. At this
point there will be no conflicts since the two branches are the same.
If we wait until there's something else on stable to merge, then there
will be conflicts.
Not only are there no conflicts, there's no changes either. So
there's no changes in the merge except for the merge ticket. It would
be nice if we could record the merge anyway without having to use
svk propedit.
--
Daniel Jacobowitz
CodeSourcery