Tuesday, 15 January 2013

unix - How to merge two directorys in Clearcase? -



unix - How to merge two directorys in Clearcase? -

1 directory has 2 files: test1.c, test2.c 2 directory has 0 files

how can re-create test1.c sec directory, using "merge".

first, directory need same, in 2 different branches (or wouldn't talk of merging in case, duplicating files)

second, if merge directory between 2 version of said directory between 2 branches, end test1.c , test2.c... empty. because merging folder isn't enough: update list of files, not content of files within folder.

the easiest way recursively merge (the folder , inside) utilize command cleartool findmerge (for clearcase 7.x, before clearteam 8.x). see "clearcase: findmerge usage".

a merge always performed in destination view, go view select folder in right destination branch (and folder still empty):

cd /path/to/view/avob/yourfolder cleartool findmerge . -nc -fver .../sourcebranch/latest -merge

note: if using clearcase ucm, have set activity first, before launching merge.

before completing merge (ie before checking in everything), able remove (cleartool rmname test2.c) file don't want.

unix version-control clearcase

No comments:

Post a Comment