[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [mdt-ocl.dev] 'archive' branches

Hi Adolfo

AFAIK there is no problem doing all the branch deletion.removal from within EGIT; the NPEs I get are benign.

I only use command line git for merge.

However, I have a suspicion that M4 EGIT may be broken; it appears that the synchonize reference is the last fetch rather than the last commit, so I have had to use command line git status to get a true view of outstanding files to commit. This prioblem may just be with my early M4 platform for which EGIT does not publish a useful download or repository; maybe I picked a bad nightly.

    Regards

        Ed

On 16/12/2011 05:35, Adolfo Sánchez-Barbudo Herrera wrote:
Well,

I'll try to remove them from command line then.

So there are required three actions when a branch is finished (and merged into master):

1. Remove the local branch in the local repository.
2. Remove the remote tracking branch in the local repository.
3. Remove the remote branch in the remote repository.

Thanks for the info.

Cheers,
Adolfo.
El 16/12/2011 13:16, Ed Willink escribió:
Hi Adolfo

I delete remote branches by pushing a delete ref just as you tried. Thereafter once the local remote tracking copies have also been deleted they do not reappear with a Fetch from Upstream.

I get NPEs quite often with EGIT. I've raised a Bugzilla. I think it's caused by EGIT abusing the platform change notifications so that EMF Compare amongst others wakes up and does something stupid.

Yes the Wiki needs updating, particularly with regards to merge, which must almost always be done from the command line because EGIT is quite useless.

    Regards

        Ed


On 16/12/2011 03:53, Adolfo Sánchez-Barbudo Herrera wrote:
Hi,

After reading the long thread, I've concluced that I have to remove the finished branches.

For the local branch was easy:

- Right Click on the local bug/318090 -> Delete Branch :)

For the remote tracking repository, I was trying the following:

- Right click on the repository (Git Repositories View) -> Push... -> Next
- Add delete ref specification -> Select bug/318090 in the combo box -> Add spec
- Finish

Well, I get an exception (NPE) and nothing happens. How are you dealing with the remote tracking removal ?

BTW, the wiki is not updated WRT the archived branches.

Regards,
Adolfo.
El 31/08/2011 6:04, Ed Willink escribió:
Hi

I was trying to say that after I deleted the archive/348504 branch on the server, the branch was also gone for my local repository and hence I couldn't easily tell where the respective commits and the merge point were.
Before updating one of my local repos, I created a bug/348504 tag and pushed it upstream. Feel free to delete it if you don't like it.
Between the lines I was trying to say that I still find this branch deletion more of an obstacle than a help. I'll try to be more explicit the next time ;-)
No problem; long emails are boring and get skim read. Short emails are ambiguous.

    Regards

        Ed
_______________________________________________
mdt-ocl.dev mailing list
mdt-ocl.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev


--
Open Canarias, S.L.
Adolfo Sánchez-Barbudo Herrera
adolfosbh(at)opencanarias(dot)com
C/Elías Ramos González, 4, ofc. 304
38001 SANTA CRUZ DE TENERIFE
Tel.: +34 922 240231


_______________________________________________
mdt-ocl.dev mailing list
mdt-ocl.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev


No virus found in this message.
Checked by AVG - www.avg.com
Version: 2012.0.1890 / Virus Database: 2108/4682 - Release Date: 12/15/11




_______________________________________________
mdt-ocl.dev mailing list
mdt-ocl.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev

--
Open Canarias, S.L.
Adolfo Sánchez-Barbudo Herrera
adolfosbh(at)opencanarias(dot)com
C/Elías Ramos González, 4, ofc. 304
38001 SANTA CRUZ DE TENERIFE
Tel.: +34 922 240231


_______________________________________________
mdt-ocl.dev mailing list
mdt-ocl.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev


No virus found in this message.
Checked by AVG - www.avg.com
Version: 2012.0.1890 / Virus Database: 2108/4684 - Release Date: 12/16/11


GIF image

GIF image