|
I'm using AnkhSVN and just recently RocketSVN but have the same problem with both.
I want to make some major changes to an application so I want to create a Branch.
The way I normally do this is that I created the Branch then switch and work from the Branch
but whenever I try to merge my changes back into the Trunk am not able for one reason or another.
Should I create the Branch then continue using the Trunk then Merge back if I want to keep changes?
This doesn't seem right to me so I haven't tried it.
I've used SVN quite a bit but I just can't seem to get the Branching through my head for some reason.
How should I/How would you do this?
|
|
|
|
|
that's a very good question!! i always have the same issues with branching and end up making a mess of the merge! ...hopefully someone with real svn expertise can advice here...
|
|
|
|
|
Yeah I usually end up deleting what's in the Trunk then I have a .bat file I run to
delete all the .svn directories then do an import. But that's so kludgy.
|
|
|
|
|
lol, definitely kludgy, there MUST be a better way! 
|
|
|
|
|
read up a bit on the subject, you're supposed to use the "svn merge" feature (how you exactly execute this depends on your svn client, I use tortoise), the output of the merge will occur on your local copy of your trunk only therefore it should give you the ability to address conflicts before committing the merged trunk. should delete branch after merger is complete.
its always easier said than done though, i know personally there can be tons of conflicts! apparently it is suggested that occasional merges (weekly?) be done from the trunk to the branch so that the final merge from the branch back to the trunk can be a bit less painful. you can pick and choose what changes to merge from the main trunk to your branch (by specifying revision numbers to merge).
|
|
|
|
|
I have read quite a bit on the subject and thought that I followed the rules but like you say there is always a ton of conflicts.
Although what you have told me reconfirms that I am doing it right by branching and then working off the trunk.
Maybe I'm using it for the wrong purpose...I want to make a ton of changes and if it works and I like it I want to keep
it but if it doesn't work then I can just delete the branch or revert and go on my merry way.
|
|
|
|
|
well to clarify, the branch should contain your experimental stuff (not sure what you mean with "working off the trunk").
|
|
|
|
|
Here's a great little summary of branching:
http://blog.red-bean.com/sussman/?p=92[^]
...in this summary, they suggest just keeping your branch synchronized with changes in your trunk... btw, i'm looking this up because i really need to learn this too!
|
|
|
|
|
Thanks for the link.
I'm going to give it a try if you hear a loud scream in the next couple of days that would be me
just ignore it and drink a beer for me.
|
|
|
|
|
I have a windows 2003 box that runs IIS 6, a simple website built in asp - yes ASP *NOT* asp.net. I have no need or desire to rewrite it in asp.net (just to get this out of the way early on).
Today I applied windows updates to it and added .Net 3.5 SP1. Rebooted. Now the friggin web server won't let you download .exe's any more, which is a bit of a sticky wicket since this is what we use to get updates for our internal software.
I've tried checking the MIME-settings - they seem OK, there's a bunch of definitions in the top level "local computer" node in the MMC UI for IIS. The directory settings for the relevant parts seem to be - namely they are set to read only, directory browsing, and the Execute permissions are set to "None".
But when I try and request the file via a browser, I get error 404, sub part 0, win error code 2, file not found.
I've tried rebooting the machine, un-installing .Net 3/3.5, allowing/disallowing ASP.NET in the web service extensions, none of which make any difference and I'm out of ideas at this point. Any suggestions? Note that sacrificing a virgin on a full moon isn't possible here in NYC due to the extreme difficulty in tracking down virgins. I'll be happy to try just about anything else though!
>>the solution<<
Rename the directory where all the sub directories with installers were. voila, all working again. WTF!? 
|
|
|
|
|
Probably no way to confirm this now on your working system BUT (if anybody else ever has this issue...) was it just screwed permissions on those files / folders?
|
|
|
|
|
That's what I thought originally. I tried all sorts of things, and as far as I can tell, the permissions were OK.
|
|
|
|
|
Jim Crafton wrote: extreme difficulty in tracking down virgins.
Does that include goats? I hear they'll do in a pinch...
Will Rogers never met me.
|
|
|
|
|
Hey guys,
is there a possibility to create .pdf files with the command line? (User shouldn't see what happen)
the reason: I create a Word file from a .dot pattern and paste many rich text files to it (.rtf) after the .doc have been created, it should be converted to a .pdf... 
(that happen in a software)
|
|
|
|
|
Short answer: Yes.
Long answer: Only if you have the program that will do the conversion, by reading the DOC file and creating PDF. Alternatively you could get a copy of one of the many PDF printer drivers that do the work for you.
I must get a clever new signature for 2011.
|
|
|
|
|
Hi, does the themes of windows 7 (areo and basic) affect to the life of laptop battery (my laptop running windows 7).
thank
|
|
|
|
|
I am not too much sure about it but when I googled about this problem I found
Yes "Turning On Aero" affect battery Life because Windows Aero enables the glass effect you see on your Windows. The Aero theme drives the GPU harder and therefore uses more power. This (surprise surprise) also uses CPU and memory and should be disabled to save battery. for more details you can go there[^]
Have go there[^] to view a website mentioned that to "Turn off Aero" in top ways to save battery.
modified on Thursday, January 27, 2011 9:52 AM
|
|
|
|
|
thank you for your information.
|
|
|
|
|
Hi.
Excuse me about my bad english.
I develop First stage of a bootloader. Now I write it in first sector (sector number 0) of a hard disk. Then attach that hard disk to the system. When I turn on that system, it can't found my bootloader and run old bootloader that saved in hard disk.
I search first 1,000,000 sectors of hard disk but old bootloader not found. What is location of old bootloader? If I Know it's location, I can write my bootloader in that location then BIOS can find my bootloader and run it.
Thanks alot
|
|
|
|
|
I think you are not looking for the bootloader but for the MBR (Master boot record) Just googling for it should answer your question.
Wout Louwers
|
|
|
|
|
Hi,
whenever i connect my laptop to ac power, it says, windows color scheme changed to basic and v.v. as windows color scheme changed.
How do i get over it to have one constant setting all the time.
I have checked everything from in dell power settings. It looks some configuration issue with respect to windows. please help.
thanks.
|
|
|
|
|
We have several remote, unmanned terminals where I require a VNC server, as using Remote Desktop prevents others using the terminals. Often the connection to one of these is extremely slow, and manually using Remote Desktop to perform the VNC installation is painstaking. What I would like to do is build a package that I could copy onto the remote terminal using Remote Desktop, and then have the package executed to install and configure VNC when the terminal restarts, as they all automatically restart nightly. The terminals are all running Windows XP. Also, out of the many VNC variants out there, which would suit this application?
|
|
|
|
|
i use tightvnc because of how easy it is to use and set up... as for an installation package, they are open source so you can modify the installation if you'd like. you should be able to set up a start-up routine using the windows scheduler.
|
|
|
|
|
Hi, I read about windows 7 in wikipedia and found that windows 7 will support color depth to 48bit. So is it possible for me to check my laptop which run windows 7 whether its support color depth to 48bits?
currently i am using epson scanner v330 and this scanner support 48bit for internal and external.
|
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
