On Fri, Sep 4, 2009 at 10:32 PM, Julie S<[email protected]> wrote: > In the case of a conflict, there will be 'C' in the place of the file which > contained conflicts. > > C foo.c > > Such a file will be split into several parts. > > foo.c > foo.c.r8115 > foo.c.r8119 > foo.c.working
These files are created by svn update when you try to update your working copy from a repository that has conflicting changes in it. The wording you just quoted is a bit funny -- I wouldn't say the file was "split". I never bother to look at any but the plain .c file, which is the original file with the conflicts given in an "alternatives" diff-like form (search for the string <<< within the file to find any conflicts). To resolve, edit the file until you're happy with it (it helps that the syntax chosen to show conflicts is one that cannot compile in C++) then run "svn resolved <filename>" to tell svn that you have resolved the conflict, and commit. Recent versions of SVN give you various options in that situation -- I always choose the one that corresponds to the default behaviour in older versions, which I think is called something like "postpone" -- so it's possible you could end up resolving the conflicts yourself during the merge rather than doing it afterwards. > After you have resolved conflicts, remove the extra files (optional, just keeping things tidy) > 2. with the different parts of foo.c what is r715, and r8119 telling me? My > guess would be that it means the revision number that there is a conflict. Revision numbers of files in the repository which are saved separately for reference, and .working is your previous working copy. Chris ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Rosegarden-devel mailing list [email protected] - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
