• Announcements

    • khawk

      Download the Game Design and Indie Game Marketing Freebook   07/19/17

      GameDev.net and CRC Press have teamed up to bring a free ebook of content curated from top titles published by CRC Press. The freebook, Practices of Game Design & Indie Game Marketing, includes chapters from The Art of Game Design: A Book of Lenses, A Practical Guide to Indie Game Marketing, and An Architectural Approach to Level Design. The GameDev.net FreeBook is relevant to game designers, developers, and those interested in learning more about the challenges in game development. We know game development can be a tough discipline and business, so we picked several chapters from CRC Press titles that we thought would be of interest to you, the GameDev.net audience, in your journey to design, develop, and market your next game. The free ebook is available through CRC Press by clicking here. The Curated Books The Art of Game Design: A Book of Lenses, Second Edition, by Jesse Schell Presents 100+ sets of questions, or different lenses, for viewing a game’s design, encompassing diverse fields such as psychology, architecture, music, film, software engineering, theme park design, mathematics, anthropology, and more. Written by one of the world's top game designers, this book describes the deepest and most fundamental principles of game design, demonstrating how tactics used in board, card, and athletic games also work in video games. It provides practical instruction on creating world-class games that will be played again and again. View it here. A Practical Guide to Indie Game Marketing, by Joel Dreskin Marketing is an essential but too frequently overlooked or minimized component of the release plan for indie games. A Practical Guide to Indie Game Marketing provides you with the tools needed to build visibility and sell your indie games. With special focus on those developers with small budgets and limited staff and resources, this book is packed with tangible recommendations and techniques that you can put to use immediately. As a seasoned professional of the indie game arena, author Joel Dreskin gives you insight into practical, real-world experiences of marketing numerous successful games and also provides stories of the failures. View it here. An Architectural Approach to Level Design This is one of the first books to integrate architectural and spatial design theory with the field of level design. The book presents architectural techniques and theories for level designers to use in their own work. It connects architecture and level design in different ways that address the practical elements of how designers construct space and the experiential elements of how and why humans interact with this space. Throughout the text, readers learn skills for spatial layout, evoking emotion through gamespaces, and creating better levels through architectural theory. View it here. Learn more and download the ebook by clicking here. Did you know? GameDev.net and CRC Press also recently teamed up to bring GDNet+ Members up to a 20% discount on all CRC Press books. Learn more about this and other benefits here.
Sign in to follow this  
Followers 0
maya18222

Tortoise SVN Questions

1 post in this topic

I've been playing about with tortoise svn and have a few questions.

 

In the case where I have created a trunk, and then copied that to a branch, modified some files in the trunk, and commited those trunk changes.

 

Case 1:

Step A) I merge from trunk to branch using "merge a range of revisions" with the "revision range to use" left blank, all goes well and I see the latest chnages from trunk in the branch, with the branch folder now having the red icon as expected. I then commit those changes in the branch and the branch icon turns green.

 

Step B) Without modifying anything, I thought I'd see what happens if I try merging from trunk to branch again. I expected nothing to happen as no further changes have been made. Yet, merging from trunk to branch again with "merge a range of revisions" with the "revision range to use" left blank causes the branch icon to again turn red. I didn't expect this, as no files have been changed. If I right click the branch and view "check for modifications" I see that the folder has a "property change"?

 

Case 2:

If I do the exact same thing, but this time not leaving the "revision range to use" blank, but instead selecting the revisions where the files changed. Step A) gives the same results, but Step B) now works as I would expect, in that the branch remains with its green icon and there are no changes.

 

Can someone explain the behaviour in the first case?

 

secondly, if I'm wanting to periodcially merge from branch to trunk, should I be using "Merge a range of revisions" or "Reintegrate branch"?

0

Share this post


Link to post
Share on other sites

Before I answer this, do you actually need to be using an SVN repository? (Or are you just trying out SVN?). Unless you have an existing codebase + SVN repo, using Tortoise GIT would be a much better alternative (and use Git for the repo). SVN is fairly unpleasant when it comes to merging branches, and often has a few quirks in the process (which by the looks of things, you're starting to hit). For the second question, I'd personally use "Reintegrate branch" for a feature branch (and leave the trunk in as clean & stable a state as possible).

0

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!


Register a new account

Sign in

Already have an account? Sign in here.


Sign In Now
Sign in to follow this  
Followers 0