WinCVS: merge by substitution
Is there a clean way to merge from a branch in such a way that the resulting merged file is exactly the same file that was on top of the branch when the merge command is issued ? Thanks in advance, Aldo Borrione Aldo BORRIONE Centro Ricerche FIAT Direzione Sistemi Elettronici DSS-Progettazione Software Tel: +39.011.9083.945 Fax:+39.011.9083.083 Email: [EMAIL PROTECTED]
R: WinCVS external diff
It works even from the main window in WinCVS 1.1b12, but the diff utility is not in my configuration a tcl progam, it is instead a win32 executable. To do the diff, I select with the mouse one version and then click on the diff icon. A panel pops up asking for the oter version to be used in the diff operation. A checkbox is then available to select the external diff utility instead of the built in command line diff. In the preference panel I simply put the path and name of the diff utility. Hope it helps Aldo -Messaggio originale- Da: Derek Scherger [mailto:[EMAIL PROTECTED]] Inviato: giovedì 6 aprile 2000 21.46 A: Glen Wiley Cc: [EMAIL PROTECTED] Oggetto: Re: WinCVS external diff I've only seen it work when you select two revisions from the graph which sounds kinda strange but it seems to be ignored from the main source window. Glen Wiley wrote: > > What does WinCVS expect to see in "Preferences" in order > to be able to use an external diff (such as tkdiff). > > I have tried specifying the complete path to tkdiff.tcl, > the complete path to wish using tkdiff as an arg. and > many other combinations to no avail. > > thanks > -- > Glen Wiley [EMAIL PROTECTED] > Staff Software Engineer > 3Com - Carrier Systems Group, R&D -- Cheers, Derek _ Derek Scherger Echologic Software Corporation mailto:[EMAIL PROTECTED] http://www.echologic.com
Files appear to be modified even if they are not
We have the repository on an HP workstation and access it as a local repository by means of a samba share, which is mounted on the developer PCs (95 or NT). Yes, I understand that pserver would be better... On an NT PC, since a few days, all the files in the developer sandbox appear in the morning as modified, they show in fact the red icon. Really, nobody has modified either the repository or the local file themselves. Other sandboxes sharing the same repository, but located on other PCs, do not suffer from this odd behaviour. (This is similar to the situation we got when local time changed a few weeks ago, but in that case all the the sandboxes on all PCs were showing the same behaviour; a simple update re-established the correct status of the *apparently* modified files.) Any suggestions for solving this problem ? Thanks in advance Aldo Borrione Aldo BORRIONE Centro Ricerche FIAT Direzione Sistemi Elettronici DSS-Progettazione Software Tel: +39.011.9083.945 Fax:+39.011.9083.083 Email: [EMAIL PROTECTED]
Merge problem with WinCVS
Maybe this is a trivial matter, but here it is: We develop in WinCVS on the main trunk and say we arrive at ver 1.4 of file.c. Then we create a branch, named my_branch, and Team A starts working on it. As a result of this work, some lines are added, some are modified and some other are deleted from the initial revision of file.c. Team B goes on on the main trunk, does a similar job as Team A and checks in, at the end, version 1.5. Now the two teams prepare from a merge from my_branch to the main trunk. How is the merge done, in detail ?? In our experience it seems that lines that are DELETED while working on the branch versions REAPPEAR after the merge if these ARE STILL present in the main trunk versions. Should this be outlined as a "whole line" conflict ? So, what kind of merge is this ? In other words, what are exactly the merge rules ? We have carefully looked at the Cederqvist, but we did not find a suitable answer to our doubts. This is very important for us since if we do not clearly understand what is behind the merge command we feel a little unconfident in the merge operation, which is not frequent in our environment but sometimes really necessary. By the way, is it possible to integrate in WinCVS an external merge tool ( such as AraxisMerge ) the same way it is possible to integrate an external diff tool ? Thanks in advance for any kind of help. Regards to all, Aldo Borrione ---- Aldo BORRIONE Centro Ricerche FIAT Direzione Sistemi Elettronici DSS-Progettazione Software Tel: +39.011.9083.945 Fax:+39.011.9083.083 Email: [EMAIL PROTECTED]
