Re: [cdt-dev] Deleting obsolete branches

[Marc Khouzam <marc.khouzam@xxxxxxxxxxxx>]

Thanks Andrew, that is a good point I hadn’t considered.

 

In the case of sd90, it was merged into master, so the history will remain; in fact, the branch sd90 (9bc85c77a33)

is actually a commit on the master branch, so it does not add much value (unless it is being used as a tag?)

 

I think (but I’ll check to be sure) that the other branches are in the same situation, except for the GDBStandalone,

which was not merged, but something like squashed into a single commit.  In that case, keeping the branch

seems a good idea so as to not loose the history.

 

If I used a tag instead of a branch, would it be as effective in keeping the history?  It would allow to keep our

branches to a minimum and yet, have all the history.  I’ll look into it.

 

Thanks for the quick answers

 

From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Andrew Gvozdev
Sent: Friday, July 25, 2014 1:53 PM
To: CDT General developers list.
Subject: Re: [cdt-dev] Deleting obsolete branches

 

Hi Marc,

sd90 branch should stay in repository as it keeps the history of changes. Master branch does not keep that history as it was a merge, not rebasing or cherrypicking.

 

Thanks,

Andrew

 

On Fri, Jul 25, 2014 at 1:43 PM, Marc Khouzam <marc.khouzam@xxxxxxxxxxxx> wrote:

Hi (mostly Jeff, Mikhail, Andrew and Sergey),

I had a quick mishap with the repo this morning which required me to remove a branch I had pushed by mistake.
This made me think I could take the opportunity to clean up some old branches that seem useless.
I find that the more clutter we have in CDT, the harder it is for new-comers to figure how things work.

After investigation I'd like to start with the below.
Let me know if you want to keep those branches.

remotes/origin/GDBStandalone  (I believe this was made as a new commit that was pushed to master)

remotes/origin/MultiProcess (created by mistake, feature is in master)
remotes/origin/NewMultiProcess (created by mistake, feature is in master)

remotes/origin/sd90 (merged into master)
remotes/origin/bug_197989_B (merged into master)
remotes/origin/bug_299911 (merged into master)
remotes/origin/bug_45203 (merged into master)

remotes/origin/bug_197989 (seems obsolete, replaced by _B branch which went into master)

Thanks

Marc
_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/cdt-dev