Results 1 to 2 of 2

Thread: Eclipse/Subversion question [URGENT]

  1. #1
    Join Date
    Jan 2006
    Location
    Ljubljana
    Posts
    687
    Thanks
    111
    Thanked 4 Times in 4 Posts
    Qt products
    Qt5 Qt/Embedded
    Platforms
    MacOS X Unix/X11 Windows Android

    Default Eclipse/Subversion question [URGENT]

    Hi to all!

    I've came to the bump which I cannot skip. Here is the problem: I have 4 projects in Eclipse CDT IDE. Now, inside there is a file globals.h, which is used by all 4 projects. All 4 projects are under version control (subversion+TortoriseSVN). Now, how do I merge all 4 globals.h in one file and move it into some "common" directory. In workspace I cannot make a directory without "parent project". So, here are questions:
    1) Will I really need to merge the differences of these 4 globals.h BY HAND or is out there some tool that does that automaticly? I've tried WinMerge, but it does not work correctly.
    2) How do I make "commonf source files" for all projects under single workspace in CDT?
    Qt 5.3 Opensource & Creator 3.1.2

  2. #2
    Join Date
    Jan 2006
    Location
    Warsaw, Poland
    Posts
    33,359
    Thanks
    3
    Thanked 5,015 Times in 4,792 Posts
    Qt products
    Qt3 Qt4 Qt5 Qt/Embedded
    Platforms
    Unix/X11 Windows Android Maemo/MeeGo
    Wiki edits
    10

    Default Re: Eclipse/Subversion question [URGENT]

    svn copy, svn move and svn merge commands are your friends.

Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •  
Digia, Qt and their respective logos are trademarks of Digia Plc in Finland and/or other countries worldwide.