[Pkg-phototools-devel] rebasing pu-branches (was: Hugin status update)

[Sebastian Harl]

Hi,

On Mon, Jul 14, 2008 at 12:58:54AM +0200, Cyril Brulebois wrote:
> Cyril Brulebois <kibi at debian.org> (14/07/2008):
> > Oh, and it looks like I noticed the pending NMU a single minute too
> > late, so I'm going to merge its contents into the unstable branch, and
> > rebase my svn-snapshot branch on top of the unstable branch.
> 
[...]
> I didn't think about the problem of possible NMUs when we're working on
> such branches, and I should have made it clear that it could be rebased
> if needed. I believe using the usual convention of the pu/* namespace
> for such branches would make sense, so that people know that they can be
> rebased (pu meaning proposed-updates).

FWIW, I'm not in favor of rebasing any branches that were made public at
any point of time. If an NMU does happen, then some parallel work was
really going on, so a merge would imho be the appropriate thing to
"visualize" that. Also, I don't think that this is what's usually going
on, so history should not become horribly complex because of the merges
introduced by proceeding like that.

OTOH, I don't want to start any religious flamewars because of that -
it's just my 2c... ;-)

Cheers,
Sebastian

-- 
Sebastian "tokkee" Harl +++ GnuPG-ID: 0x8501C7FC +++ http://tokkee.org/

Those who would give up Essential Liberty to purchase a little Temporary
Safety, deserve neither Liberty nor Safety.         -- Benjamin Franklin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-phototools-devel/attachments/20080714/6af2fd4f/attachment.pgp