Re: [PATCH] Add "list" and "rm" sub commands to tg-depend

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



2009/4/9 Ira Weiny <weiny2@xxxxxxxx>:
> On Thu, 9 Apr 2009 14:43:37 +0200
> Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> wrote:
>> You might want to check
>>
>>       http:// thread.gmane.org/gmane.comp.version-control.git/114581
>
> Ah this brings up more issues I had not thought about...  :-(  But perhaps
> Bert's work could be used to help implement "rm".  Thoughts?
No, it wont help. Because the base and tip of the topic should not
changed in respect to the old state (expect for .topdeps of course).

If you really want to remove a dependency, you need to revert a merge
of this dep from the topic base. which is not possible today, or maybe
I have just an idea for this:

  'topic': the topic
  'base':  the base of the topic, i.e. a merge from all dependent
topics dep0, ..., depN

say you want to remove dep0

  1) merge all deps dep1, ..,depN into 'new-base'

  2) merge 'new-base' into base with the merge driver 'theirs', that
would overwrite all changes from dep0 in the 'base'

  3) update 'topic' to the updated 'base'

Any thoughts from someone who knows more than me?

Bert

> Thanks,
> Ira
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]