[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [Subclipse-users] Merge dialog: browse dialog shows only current project.

From: Alexander Kitaev <alex_at_tmate.org>
Date: 2006-05-03 15:39:13 CEST

> >> Should I submit a bug or do I miss something? Thanks!
> >>
> Why don't you switch to the branch then merge?
I have a project checked out from "trunk" in my workspace and another person
created a branch from "trunk" and added new feature in that new branch. This
branch was created specially for that new feature not to make code in
"trunk" uncompilable or unworkable. As this feature is completed I would
like to merge it into "trunk", i.e. merge changes made in branch into my
project, review and then commit to "trunk". The most convenient way to do
that is just to merge branch changes into my project.

Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/

> -----Original Message-----
> From: Vincent GOUDE [mailto:vincent.goude@kereval.com]
> Sent: Wednesday, May 03, 2006 15:29
> To: users@subclipse.tigris.org
> Subject: Re: [Subclipse-users] Merge dialog: browse dialog
> shows only current project.
>
>
> Mark Phippard a écrit :
> > "Alexander Kitaev" <alex@tmate.org> wrote on 05/03/2006 08:25:23 AM:
> >
> >
> >> I was trying to make a merge from a branch and selected
> "Browse..."
> >> in
> >>
> > merge
> >
> >> dialog to put branch URL into "From" field. Surprisingly,
> repository
> >>
> > browser
> >
> >> displays only folders below "trunk", not allowing me to go to the
> >> upper level to select a branch. So, I was forced to type in "From"
> >> URL instead
> >>
> > of
> >
> >> selecting it.
> >>
> >> Should I submit a bug or do I miss something? Thanks!
> >>
> Why don't you switch to the branch then merge?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed May 3 15:41:41 2006

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.