On Wednesday 27 November 2002 10:53 am, Rob van Maris wrote: > It's not as simple as that. What you describe is the CVS join command: > CVS update -j <branchname> <filename(s)> > > What this does: merge all changes in the specified branch into the current > branch. wrong: only the file(s) you selected
> In general this is undesirable for these reasons: > - There may be additional changes in the specified branch that you don't > want to be merged. I realy don't know what U are talking about? what situations. > - If a change has already been made in both branches, it will be merged > into the present branch a second time - which is certainly not wat you > want. - This happens also when merging from the same branch several times, > as some changes will be merged repeatedly. as I understand the files wil be diffed so wat wil be merged "mutilple" times? ??? > One way to avoid these problems is by specifying revisions manually: > CVS update -j <revision1> -j <revision2> <filename(s)> > This merges changes between the specified revisions to the current branch. Thanks this realy helps a lot. If it's me you have something againts just say it. but I think you have been quite a pain in the *ss lately.
