Can not merge branches when files were added

( CVSSCC , VS .NET, Latest, WIN 2000/XP, CVS NT 2.0.x )

Type: Public Status:Closed Created: 18 Nov 04 11:00 Updated: 30 Nov 04 11:00

--> Igor Pushkov (admin) at 30 Nov 04 11:00 writes

Well, you have at least 3 option to resolve that problem. The reason
of problem is that IDE communicate with plug-in on file level (submit
list of files), those, when you merge branches it merge only that
files that it knows. So, now the solution:
1. Most simple is to do this outside IDE. We consider branches with
new files as complex case and perform them outside IDE. However this
need some experience with CVS from you.
2. All new files, that appears on source branch (marked with !
exclamation mark) are not merged yet. Just merged the solution/project
file, which now knows about those file. You click on solution root,
chose "Source Control\Get", mark only those files, and merge them
again. This will solve your current state.
3. To avoid such problems, but still merge in IDE you can:
a) First merge sln files (to take care on case when new projects
addede or deleted into project)
b) The merge all project files
c) and them merge all other files
With this sequence you will have correct results.

--> Brian Smith (user) at 30 Nov 04 11:00 writes

Opened Existing VB project and added to source control
Removed VSS Files
Label via plug-in to 2-3
Created Branch 2-3.11fix
Changes Files and Added 1 additional file in branch
Switched to 2-3 label index
In Get tool, selected Merge with 2-3.11fix
All files were merged successfully (changes were added) with the exception
of the additional file as noted in the screen shot. It realized it was
added, but I could not get the source to commit it or add it to CVS
Let me know if you need any more information.
-----Original Message-----
From: support@pushok.com [mailto:support@pushok.com]
Sent: Tuesday, November 30, 2004 9:23 AM
To: brian@igcn.com
Subject: [pst379] Can not merge branches when files were added
http://www.pushok.com/tickets_addmodify.php?id=379
I am sorry for delay with your ticket. Could you describe in few steps how
you managed to merge branches. I need some info like this:
1. Create empty VB projet.
2. Create tag in plug-in.
3. Switch onto this tag in plug-in.
4. Add new file. Check-in changes
5. Switch back to HEAD branch
6. ...
---
Incoming mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.802 / Virus Database: 545 - Release Date: 11/26/2004
---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.802 / Virus Database: 545 - Release Date: 11/26/2004

--> Igor Pushkov (admin) at 30 Nov 04 11:00 writes

I am sorry for delay with your ticket. Could you describe in few steps how
you managed to merge branches. I need some info like this:

1. Create empty VB projet.
2. Create tag in plug-in.
3. Switch onto this tag in plug-in.
4. Add new file. Check-in changes
5. Switch back to HEAD branch
6. ...

--> Brian Smith (user) at 29 Nov 04 11:00 writes

Can anyone address this issue or answer my question... we are evaluating
this software and this is a huge issue for us at this point.

--> Brian Smith (user) at 18 Nov 04 11:00 writes

When merging a branch back in that contains a new file, the file shows up
in the IDE as checked out with an exclamation point next to it. There is
no way to obtain this file from source control and the code for the file
doesn't show up.

I can't seem to figure out how to merge these branches together when a new
file is added to a branch.

Screenshot of issue

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

Can not merge branches when files were added