Skip Menu |

This queue is for tickets about the svk CPAN distribution.

Report information
The Basics
Id: 29424
Status: new
Priority: 0/
Queue: svk

Owner: Nobody in particular
Requestors: drow [...]

Bug Information
Severity: (no value)
Broken in: (no value)
Fixed in: (no value)

Subject: Recording empty merges can be useful
Date: Mon, 17 Sep 2007 09:16:26 -0400
To: bug-svk [...]
From: Daniel Jacobowitz <drow [...]>
Download (untitled) / with headers
text/plain 766b
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

This service is sponsored and maintained by Best Practical Solutions and runs on infrastructure.

Please report any issues with to