|
In continuation with my last post - Integration hell[^]
I agree with you all that more than anything it's a workflow issue and now finally I have taken out time to fix the workflow issue once and for all.
I am going through various documentation about SVN workflow best practices and a bit confused what should be the ideal structure.
First I will explain our development environment -
5 developers working from one location and 4 developers working from offshore location. Apart from this 2 product managers may need to push small css changes every now and then like colour change etc
Now my questions are:
1. Should I really consider distributed version control like GIT or stick to SVN as other team members are familiar with SVN more than GIT. So there will be learning curve for all if we switch to GIT also server is all set up for SVN so bit of cost issue as well.
But if it really adds value (like merging is way more easy in GIT) then I am sure I can try to convince to move to distributed version control.
2. If I stick to SVN what is the recommended way to structure Trunk, Branch and Tag?
Thanks for all your help.
|
|
|
|
|
We have now the same issues somehow. It is getting clearer, that Git wins because it has more advantages because branching and merging is better. And rebasing cleans up with messie trees.
Our tree will be more like different developments trees (sprints) and a master tree, which will get tags. After some discussion we are convinced that branching is temporary because every branch gets (somehow) merged in the master.
Press F1 for help or google it.
Greetings from Germany
|
|
|
|
|
Where I work, we used a versioning tool similar to SVN and then we transitioned to GIT mainly due to reliability issues in the tool we used but also somewhat due to merging issues. The learning curve for most of us was steep and there was a lot of training given. For the most part, it seems that we are getting better at using GIT. One of the big advantages is the submodule functionality so that multiple projects can reuse one submodule which may be at different branches at different times. So that allows us to consume submodule changes only when we want to.
Things that GIT doesn't do too well:
1. History is important to us and the GIT merge feature basically rewrites history. So we decided to use only use rebase.
2. We have also had problems when rebasing on top of large number of changes. GIT did not merge/rebase correctly and it didn't give any indication that something went wrong.
3. GIT does not handle binary files very well - uses more space
4. It often happens that 2 developers try to rebase and push their changes at the same time and when pushing, they get an error that their branch is out of date and so they have to do that whole process again. After doing that a few times, I have abandoned the practice to make sure that everything still compiles before pushing. This has resulted in some build instability (not only due to me  )
5. It is not easy to find what version of a given file is actually included in a given build without first checking out to the SHA-1 of that build. This is more of an annoyance because you may need to check something while you are in the middle of modifying files. One of my pet peeves with GIT is that you can't tell from two SHA-1's of a file, which is the earlier version.
Having said all that, I would tend to stick with SVN for your situation but that may just be that I'm old school 
With regards to the Trunk, Branch and Tag, I would only use a separate branch if there would be a lot of changes made before a new release is ready for the production server. We used a 'development' tag to indicate that a particular file was locally tested and deemed fit for production. This tag is then used to build a stable version of code. Changes could be made to the file and checked in but the development label would not be pulled up until local testing (whatever that entails) has been completed.
I hope this long-winded response helps. All the best with the decisions you need to make.
|
|
|
|
|
Give me good old PVCS, lock those files to make sure no one else can screw around in where you are working.
Half serious, but then I don't like change.
If you go to Git use either SourceTree or GitKraken, the GitHub windows app hides way to much of the functionality.
|
|
|
|
|
I'll never go back to file locking, but I do admit that the current development group I work with has no idea how to do a merge operation.
Charlie Gilley
<italic>Stuck in a dysfunctional matrix from which I must escape...
"Where liberty dwells, there is my country." B. Franklin, 1783
“They who can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety.” BF, 1759
|
|
|
|
|
We ditched SVN a few years ago and moved to Git. I'd never go back.
The transition was smooth, the learning curve surprisingly un-steep (admittedly we use very few features) and Visual studio 2015 support totally adequate.
cheers
Chris Maunder
|
|
|
|
|
Since I fitted an SSD, Corel Paintshop Pro X6 loads in seconds - so I load it, use it, close it.
And when I close it, I get a message suggesting I upgrade to X8 at a discount (the message has a "don't show me this again" but this is Corel, so clicking the checkbox closes the dialog rather than actually working...)
And I have indeed upgraded, a couple of weeks ago, but it loads a lot slower, and I'm not familliar with it yet, so for quick jobs, I load X6.
And the first time I close it, I get a discount offer: 85%.
The second time, I get 75% off
Then 45% off.
Then 25% off (IIRC)
So... if I don't accept, the price goes UP? 
Corel - you're weird
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
OriginalGriff wrote: And when I close it, I get a message suggesting I upgrade to X8 at a discount (the message has a "don't show me this again" but this is Corel, so clicking the checkbox closes the dialog rather than actually working...)
It still happens in X7... and X8...
OriginalGriff wrote: Corel - you're weird
I think you meant "f*cked up".
".45 ACP - because shooting twice is just silly" - JSOP, 2010
-
You can never have too much ammo - unless you're swimming, or on fire. - JSOP, 2010
-
When you pry the gun from my cold dead hands, be careful - the barrel will be very hot. - JSOP, 2013
|
|
|
|
|
Ever since Corel bought them, I switched to PhotoFiltre[^]. V6 is free.
|
|
|
|
|
I see you can create icon files with it - Very nice! 
Get me coffee and no one gets hurt!
modified 13-Apr-16 13:38pm.
|
|
|
|
|
I hung on with JASC V9 for ages - but it didn't play nice with Aero, so I eventually bit the bullet and ungraded to X6*
It has all the usual Corel signs: more bugs, slower, load of features nobody uses (or even remembers were there until it's too late).
* I meant to write "upgraded" but perhaps I've coined a new word: "To Ungrade: To install a later version of software that isn't as good as the version you were using"
Example: "I ungraded from Windows 7 to Windows 10"
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
I was having problems loading hi-res images. Anything higher that 200dpi and I would have to load the file in parts, convert the layers to raster, and add them one at a time to the final image. What a pain. At least in X8, I can work with the entire layered image without crashes (although it's painfully slow with a large image and a lot of layers). I hate the interface though - the old one (in PSP7) was fine.
".45 ACP - because shooting twice is just silly" - JSOP, 2010
-
You can never have too much ammo - unless you're swimming, or on fire. - JSOP, 2010
-
When you pry the gun from my cold dead hands, be careful - the barrel will be very hot. - JSOP, 2013
|
|
|
|
|
I definitely agree on the interface: I still can't get the tool palettes to go where I want 'em...
But I could open a 600dpi, 3880 x 4997 image and edit it in V9. Mind you, the pspimage file was 117MB! 
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
Paint.NET[^] is also very good.
"These people looked deep within my soul and assigned me a number based on the order in which I joined."
- Homer
|
|
|
|
|
OriginalGriff wrote: And the first time I close it, I get a discount offer: 85%.
The second time, I get 75% off
Then 45% off.
Then 25% off (IIRC)
So... if I don't accept, the price goes UP?
So find the persistent counter in the registry, and change it to a negative value so Corel pays you to get the latest version.
|
|
|
|
|
I gave up on them with XII, and haven't upgraded since.
Guess what! It still works!
I wanna be a eunuchs developer! Pass me a bread knife!
|
|
|
|
|
Paintshop Pro 9 still does everything I need
=========================================================
I'm an optoholic - my glass is always half full of vodka.
=========================================================
|
|
|
|
|
If someone asks what they should use for a place that researchers can share documents and have discussions what would you recommend?
This would be a global 'community'.
I first thought of Yammer, but it seems to be for internal for businesses and this would be open to any internet user if approved.
No Facebook group is desired as they are looking for something more professional.
Thanks in advance.
|
|
|
|
|
|
 I second this. Slack is a great tool for sharing/collaboration.
The United States invariably does the right thing, after having exhausted every other alternative. -Winston Churchill
America is the only country that went from barbarism to decadence without civilization in between. -Oscar Wilde
Wow, even the French showed a little more spine than that before they got their sh*t pushed in.[^] -Colin Mullikin
|
|
|
|
|
I haven't used Slack before, can people outside the organization join and can it have auto-join?
|
|
|
|
|
I have no idea - only started using it yesterday! 
|
|
|
|
|
SharePoint 2013 - it's wonderful!
- I would love to change the world, but they won’t give me the source code.
|
|
|
|
|
Yeah, Were are not fully on Office 365 yet, so 
|
|
|
|
|
*pukes*
Sp used to be great.
I wanna be a eunuchs developer! Pass me a bread knife!
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
