On Mon, Sep 1, 2008 at 12:11, Jan Nieuwenhuizen <janneke-list@xxxxxxxxx> wrote: > On ma, 2008-09-01 at 11:31 +0200, Bert Wesarg wrote: > > Hi Bert, > >> >> On Fri, Aug 15, 2008 at 15:53, Jan Nieuwenhuizen <janneke-list@xxxxxxxxx> wrote: >> > As discussed previously >> > >> > http://kerneltrap.org/mailarchive/git/2008/8/13/2925144 >> > >> > Change a topgit branch's dependencies by doing a rebase-by-merge. >> > >> > >> is this script in use by you, or is it abandoned in favor of another idea? > > I haven't had the time to digest the several new takes on this, esp. > http://kerneltrap.org/mailarchive/git/2008/8/15/2954214 and combining > my previous attempt's use of git revert and git cherry-pick with git > read-tree to make for a much faster adding or removal of > dependencies. > >> Anyway, I have tried it today but it looks like the top-bases wasn't >> updated to the new deps. > > How odd. It also looks like "redeps" contains the new set of > dependencies, which is written to .topdeps. I guess that most of > this script will be abandoned anyway, but a nice bug report ie: how to > reproduce this error never hurts ;-) Yeah, sorry, here comes part two: I have tried to switch the order of two topics, which are the only two in this 'series'. T1 depdens on master, and T2 on T1 with definitive merge conflicts. first step was to redepend T2 to master: $ tg redepend master after that, I saw the above odds, i.e.: * the refs/top-bases/T2 points still to T1 not master * (NEW) the .topmsg is lost (which I discovered after step two) * a trailing empty line is in .topdeps (NEW) step two was to redpend T1 on T2: $ git checkout T2 $ tg redepend T2 after that, my T1 changes were lost, i.e. the worktree is in state of T2. I have attached the log of this session (slightly edited). Thanks anyway for working on this. Regards Bert > Greetings, > Jan.
Attachment:
tg-redpend-log
Description: Binary data
